Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java

@@ -211,4 +211,16 @@ public class ChanjetController {
         chanjetManager.queryWarehouse();
         return success(true);
     }
+
+    public void synchronizeData() throws ChanjetApiException{
+
+        chanjetManager.queryDept();
+        chanjetManager.queryWorkshop();
+        chanjetManager.queryCustomer();
+        chanjetManager.querySupplier();
+        chanjetManager.queryMaterial();
+        chanjetManager.queryProjectOrder();
+
+        chanjetManager.queryWarehouse();
+    }
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/equipmaintenancerecord/vo/EquipMaintenanceRecordPageReqVO.java

@@ -27,9 +27,13 @@ public class EquipMaintenanceRecordPageReqVO extends PageParam {
     @Schema(description = "设备id", example = "12621")
     private Long equipId;
 
+    @Schema(description = "车间id", example = "12621")
+    private Long workshopId;
+
     @Schema(description = "描述", example = "随便")
     private String description;
 
+
     @Schema(description = "维保人")
     private Long owner;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/equipmaintenancerecord/EquipMaintenanceRecordMapper.java

@@ -45,6 +45,7 @@ public interface EquipMaintenanceRecordMapper extends BaseMapperX<EquipMaintenan
                 .eqIfPresent(EquipMaintenanceRecordDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getCreateTime, reqVO.getCreateTime())
                 .betweenIfPresent(EquipMaintenanceRecordDO::getSubmitTime, reqVO.getSubmitTime())
+                .eq(reqVO.getWorkshopId()!=null,WorkshopDO::getId,reqVO.getWorkshopId())
                 ;
 
         return selectPage(reqVO, query);

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java

@@ -103,9 +103,9 @@ public class StorageServiceImpl implements StorageService {
         reqVO.setStockId(updateReqVO.getId())
                 .setWhId(updateReqVO.getWhId());
         List<StorageMatDO> storageMatList = storageMatService.getStorageMatPage(reqVO);
-        if(CollUtil.isEmpty(storageMatList)) {
-            throw exception(STORAGE_MAT_NOT_EXISTS);
-        }
+//        if(CollUtil.isEmpty(storageMatList)) {
+//            throw exception(STORAGE_MAT_NOT_EXISTS);
+//        }
 
         // 获取系统参数，判断是否允许超量出库
         SystemParametersDO systemParametersDO = systemParametersMapper.selectOne("code", SystemParmetersEnum.NEGATIVE_INVENTORY_SWITCH.getDescription());
@@ -115,7 +115,7 @@ public class StorageServiceImpl implements StorageService {
             isAllow = true;
         }
 
-        if(isAllow) {
+        if(!isAllow) {
             for (StorageMatDO storageMatDO : storageMatList) {
                 if (storageMatDO.getStorageOkQty().compareTo(new BigDecimal(0)) == 0
                         || storageMatDO.getStockQuantity().compareTo(storageMatDO.getStorageOkQty()) < 0) {

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java

@@ -60,8 +60,8 @@ public class UnqualifiedNotificationServiceImpl implements UnqualifiedNotificati
 
         if(createReqVO.getMediaList().stream().count()>0){
             for(UnqualifiedNotificationFileReqVO item : createReqVO.getMediaList()){
-                FileDO fileDO = fileMapper.selectOne("business_id",item.getK());
-                item.setK(unqualifiedNotification.getId().toString());
+                FileDO fileDO = fileMapper.selectOne(FileDO::getBusinessId,item.getK());
+                fileDO.setBusinessId(Long.parseLong(item.getK()));
                 fileMapper.updateById(fileDO);
             }
         }

mes-ui/mes-ui-admin-vue3/src/views/biz/PMRecords/index.vue

@@ -7,12 +7,12 @@
       <!-- 搜索工作栏 -->
       <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="115px">
         <el-form-item label="卡片名称" prop="type">
-          <el-select class="!w-260px" v-model="queryParams.type" placeholder="请选择卡片名称">
+          <el-select class="!w-260px" v-model="queryParams.type" clearable placeholder="请选择卡片名称">
             <el-option v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_EQUIP_MAINTENANCE_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="设备名称" prop="equipId">
-          <EquipmentSelect class="!w-260px" v-model="queryParams.equipId" @update:newValue="handleSelectedequip" :disabled="detailDisabled||updateDisabled" />
+          <EquipmentSelect class="!w-260px" v-model="queryParams.equipId" @update:newValue="handleSelectedequip"  />
         </el-form-item>
         <el-form-item label="所属车间" prop="workshopId">
           <WorkshopSelect v-model="queryParams.workshopId" class="!w-250px" @update:newValue="handleSelectedWorkshop" />
@@ -126,6 +126,7 @@ const queryParams = reactive({
   code: undefined,
   type: undefined,
   equipId: undefined,
+  workshopId:undefined,
   description: undefined,
   owner: undefined,
   progress: undefined,
@@ -216,10 +217,10 @@ onMounted(() => {
 
 //接收车间传递的数据
 const handleSelectedWorkshop = (newValue: any) => {
-  queryParams.workshopId = newValue.id
+  queryParams.workshopId = newValue?.id
 }
-const handleSelectedequip = () => {
-  queryParams.businessLine = newValue?.id
+const handleSelectedequip = (newValue) => {
+  queryParams.equipId = newValue?.id
 }
 </script>