Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java

@@ -127,6 +127,14 @@ public class PgMasterController {
         PageResult<PgMasterLineDO> pageResult = pgMasterService.getTaskDispatchDetailPage(pageReqVO);
         return success(pageResult);
     }
+
+    @GetMapping("/task-dispatch-detail/pageWx")
+    @Operation(summary = "获得派工明细分页")
+    @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
+    public CommonResult<PageResult<PgMasterLineDO>> getTaskDispatchPageDetailWx(@Valid PgMasterLinePageReqVO pageReqVO) {
+        PageResult<PgMasterLineDO> pageResult = pgMasterService.getTaskDispatchDetailPageWx(pageReqVO);
+        return success(pageResult);
+    }
     @GetMapping("/task-dispatch-detail/pages")
     @Operation(summary = "获得质量派工单过程检验行分页")
     @PreAuthorize("@ss.hasPermission('heli:pg-master-line:query')")

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/vo/StorageNowAllReqVO.java

@@ -24,7 +24,7 @@ public class StorageNowAllReqVO {
 
     @Schema(description = "仓库id")
     private Integer whId;
+    //是否全部数据
+    private boolean isALL;
 
-
+}
-
-}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java

@@ -123,6 +123,13 @@ public class ZjPgMasterController {
         return success(pageResult);
     }
 
+    @GetMapping("/task-dispatch-detail/pageWx")
+    @Operation(summary = "获得派工明细分页")
+    @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
+    public CommonResult<PageResult<ZjPgMasterLineDO>> getTaskDispatchPageDetailWx(@Valid ZjPgMasterLinePageReqVO pageReqVO) {
+        PageResult<ZjPgMasterLineDO> pageResult = zjPgMasterService.getTaskDispatchDetailPageWx(pageReqVO);
+        return success(pageResult);
+    }
     @GetMapping("/task-dispatch-detail/get")
     @Operation(summary = "获得派工明细分页")
     @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java

@@ -11,6 +11,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.PgMasterLin
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
@@ -72,7 +73,26 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
         return selectPage(reqVO, query);
     }
 
+    default PageResult<PgMasterLineDO> selectPageWx(PgMasterLinePageReqVO reqVO) {
+        MPJLambdaWrapper<PgMasterLineDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(PgMasterLineDO.class)
+                .select("d.amounts,d.workTime")
+                .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id   from quality_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id")
+                .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,PgMasterLineDO::getProjectSubId)
+                .leftJoin(PlanDO.class,"pl",PlanDO::getProjectId,ProjectOrderSubDO::getProjectOrderId)
+                .eq(PlanDO::getStatus,2)
+                .orderByDesc(PlanDO::getId)
+                .disableSubLogicDel();
 
+        query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser())
+                .eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType())
+                .eq(reqVO.getDispatchStatus() != null, PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus())
+
+
+        ;
+
+        return selectPage(reqVO, query);
+    }
 
     default PageResult<PgMasterLineDO> selectPages(PgMasterLinePageReqVO reqVO) {
         MPJLambdaWrapper<PgMasterLineDO> query = new MPJLambdaWrapper<>();
@@ -124,4 +144,4 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
 
     }
 
-}
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterMapper.java

@@ -7,8 +7,11 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.*;
 
@@ -33,8 +36,43 @@ public interface PgMasterMapper extends BaseMapperX<PgMasterDO> {
                 .betweenIfPresent(PgMasterDO::getPgDatetime, reqVO.getPgDatetime())
                 .orderByDesc(PgMasterDO::getId));
     }
+    default PageResult<PgMasterDO> selectPageWx(PgMasterPageReqVO reqVO) {
+        MPJLambdaWrapper<PgMasterDO> query = new MPJLambdaWrapper<>();
+        query.
+            leftJoin(PlanDO.class,"p",PlanDO::getProjectId,PgMasterDO::getProjectId)
+                .eq(PlanDO::getStatus,2)
+        .orderByDesc(PgMasterDO::getId);
+        if (reqVO.getCreateTime() != null) {
+            query.between(PgMasterDO::getCreateTime, reqVO.getCreateTime()[0],reqVO.getCreateTime()[1]);
+        }
+        if (reqVO.getPgNumber() != null) {
+            query.eq(PgMasterDO::getPgNumber, reqVO.getPgNumber());
+        }
+        if (reqVO.getTaskNo() != null) {
+            query.eq(PgMasterDO::getTaskNo, reqVO.getTaskNo());
+        }
+        if (reqVO.getTaskId() != null) {
+            query.eq(PgMasterDO::getTaskId, reqVO.getTaskId());
+        }
+        if (reqVO.getProjectId() != null) {
+            query.eq(PgMasterDO::getProjectId, reqVO.getProjectId());
+        }
+        if (reqVO.getProjectNo() != null) {
+            query.eq(PgMasterDO::getProjectNo, reqVO.getProjectNo());
+        }
+        if (reqVO.getProjectName() != null) {
+            query.like(PgMasterDO::getProjectName, reqVO.getProjectName());
+        }
+        if (reqVO.getPgUser() != null) {
+            query.eq(PgMasterDO::getPgUser, reqVO.getPgUser());
+        }
+        if (reqVO.getPgDatetime() != null) {
+            query.between(PgMasterDO::getPgDatetime, reqVO.getPgDatetime()[0], reqVO.getPgDatetime()[1]);
+        }
+        return selectPage(reqVO, query);
 
+    }
 
     List<PgMasterLineDO>   selectgcjinsert(Long id);
     List<ZjPgMasterLineDO>   selectgcjinsertzj(Long id);
-}
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java

@@ -10,6 +10,8 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster.vo.PgMasterLin
 import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMasterLinePageReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.zjpgmaster.ZjPgMasterLineDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -53,7 +55,11 @@ public interface ZjPgMasterLineMapper extends BaseMapperX<ZjPgMasterLineDO> {
         query.selectAll(ZjPgMasterLineDO.class)
                 .select("d.amounts,d.workTime")
                 .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id   from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id")
-                .orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber)
+                .leftJoin(ProjectOrderSubDO.class,"pos",ProjectOrderSubDO::getId,ZjPgMasterLineDO::getProjectSubId)
+                .leftJoin(PlanDO.class,"pl",PlanDO::getProjectId,ProjectOrderSubDO::getProjectOrderId)
+                .eq(PlanDO::getStatus,2)
+                .orderByDesc(PlanDO::getId)
+
                 .disableSubLogicDel();
 
         query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser())
@@ -65,8 +71,24 @@ public interface ZjPgMasterLineMapper extends BaseMapperX<ZjPgMasterLineDO> {
         return selectPage(reqVO, query);
     }
 
+    default PageResult<ZjPgMasterLineDO> selectPageWx(ZjPgMasterLinePageReqVO reqVO) {
+        MPJLambdaWrapper<ZjPgMasterLineDO> query = new MPJLambdaWrapper<>();
+        query.selectAll(ZjPgMasterLineDO.class)
+                .select("d.amounts,d.workTime")
+                .leftJoin("(select SUM(c.amount) as amounts ,SUM(c.work_time) as workTime,c.zj_mx_id   from quality_zj_bg_master_line c group by c.zj_mx_id) d on d.zj_mx_id = t.id")
+                .orderByAsc(ZjPgMasterLineDO::getTaskNo,ZjPgMasterLineDO::getPgNumber)
+                .disableSubLogicDel();
+
+        query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser())
+                .eq(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType())
+                .eq(reqVO.getDispatchStatus()!=null,ZjPgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus())
+
+        ;
+
+        return selectPage(reqVO, query);
+    }
     default int deleteByZlPgId(Integer zlPgId) {
         return delete(ZjPgMasterLineDO::getZlPgId, zlPgId);
     }
 
-}
+}

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java

@@ -65,7 +65,7 @@ public interface PgMasterService {
 
 
     PageResult<PgMasterLineDO> getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO);
-
+    PageResult<PgMasterLineDO> getTaskDispatchDetailPageWx(PgMasterLinePageReqVO pageReqVO);
     PageResult<PgMasterLineDO> getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO);
 
     PgMasterLineDO getLine(Integer id);

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java

@@ -245,7 +245,10 @@ public class PgMasterServiceImpl implements PgMasterService {
     public PageResult<PgMasterLineDO> getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO) {
         return pgMasterLineMapper.selectPage(pageReqVO);
     }
-
+    @Override
+    public PageResult<PgMasterLineDO> getTaskDispatchDetailPageWx(PgMasterLinePageReqVO pageReqVO) {
+        return pgMasterLineMapper.selectPageWx(pageReqVO);
+    }
 
     @Override
     public PgMasterLineDO getLine(Integer id) {

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java

@@ -127,7 +127,11 @@ public class StorageLogServiceImpl implements StorageLogService {
             return storageLogNowMapper.selectNoZero(queryReqVO);
         }else{
             // 筛选全部的实时库存数据，包含未分配仓库的物料信息和已分配仓库的物料信息
-            return storageLogNowMapper.selectNowList(queryReqVO);
+            if(queryReqVO.isALL()){
+                return storageLogNowMapper.selectNowList(queryReqVO);
+            }else{
+                return storageLogNowMapper.selectNowList(queryReqVO);
+            }
         }
         //
     }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -345,7 +345,24 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
         List<TaskDispatchDetailDO> list = taskDispatchDetailDOPageResult.getList();
         List<TaskDispatchDetailDO> afterList = new ArrayList<>();
         if (CollUtil.isNotEmpty(list)){
-            Map<String, List<TaskDispatchDetailDO>> collect = list.stream().collect(Collectors.groupingBy(TaskDispatchDetailDO::getDispatchCode));
+            Map<String, List<TaskDispatchDetailDO>> collect ;
+                    if(pageReqVO.getProcedureStatusList().size()==1 && pageReqVO.getProcedureStatusList().get(0)==2){
+                        collect = list.stream()
+                                .collect(Collectors.groupingBy(
+                                        TaskDispatchDetailDO::getDispatchCode,
+                                        () -> new TreeMap<>(Comparator.reverseOrder()),
+                                        Collectors.toList()
+                                ));
+
+                    }else {
+                        collect = list.stream()
+                                .collect(Collectors.groupingBy(
+                                        TaskDispatchDetailDO::getDispatchCode,
+                                        TreeMap::new,
+                                        Collectors.toList()
+                                ));
+                    }
+
             collect.forEach((code,list2)->{
                 list2.sort(Comparator.comparing(TaskDispatchDetailDO::getSort, Comparator.nullsLast(Integer::compareTo)));
                 afterList.addAll(list2);
@@ -477,7 +494,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                                 .eq(TaskDispatchDO::getDispatchType,"ASSEMBLE"));
                 //零件是否生产完成
                 List<TaskDispatchDetailDO> taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchId(taskDispatchDO.getId());
-                List<TaskDispatchDetailDO> productionList = taskDispatchDetailDOS.stream().filter(e -> e.getDispatchType().equals("PRODUCTION") && !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList());
+                List<TaskDispatchDetailDO> productionList = taskDispatchDetailDOS.stream().filter(e -> !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList());
                 //过程检 零件所有生产派工完成生成
                 boolean isBomDetailProductionOver = true;
                 //终检 子项目装配派工都完成
@@ -485,7 +502,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                 //生产零件派工判断是否生成过程检
                 if (CollUtil.isNotEmpty(productionList)){
                     for (TaskDispatchDetailDO dispatchDetailDO : productionList) {
-                        if (dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
+                        if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) &&
+                                dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){
                             isBomDetailProductionOver = false;
                             break;
                         }
@@ -502,7 +520,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
                     }
                 }
                 if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){
-                        pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId());
+                        pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId());
                     }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver){
                         zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId());
                     }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java

@@ -81,7 +81,7 @@ public interface ZjPgMasterService {
     List<ZjPgMasterLineDO> searchZXMMx(Long task_id,Long project_id);
 
     PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO);
-
+    PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPageWx(ZjPgMasterLinePageReqVO pageReqVO);
     ZjPgMasterLineDO getTaskDispatchDetail(ZjPgMasterLinePageReqVO pageReqVO);
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java

@@ -67,7 +67,10 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService {
     public PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO) {
         return zjPgMasterLineMapper.selectPage(pageReqVO);
     }
-
+    @Override
+    public PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPageWx(ZjPgMasterLinePageReqVO pageReqVO) {
+        return zjPgMasterLineMapper.selectPageWx(pageReqVO);
+    }
     @Override
     public Boolean insertZjList(Long task_id,Long project_id,Long planSubId){
         //查询BOM明细

mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml

@@ -47,7 +47,7 @@
     <select id="selectNowList"
             parameterType="com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageNowAllReqVO"
             resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO">
-        select * from (
+        select distinct * from (
             select * from v_storage_material_now where wh_id=#{whId}
             union all
             select deleted,id,creator,updater,create_time,update_time,tenant_id,code as mat_code,name as mat_name,
@@ -55,7 +55,7 @@
             mat_type,spec as mat_spec,
             (select label from system_dict_data where dict_type='heli_material_unit' and value= mat.unit) as mat_unit,
             brand as mat_brand,'' as wh_id, '' as wh_name,'' as rg_id,'' as rg_name,'' as pn_id,'' as pn_name,''
-            lot_no,short_name,0 as storage_ok_qty
+            lot_no,short_name,0 as storage_ok_qty,0 as sum_kc_money
             from base_material as mat where virtual_part='N' and mat.status=1 and not exists(select id from v_storage_material_now where wh_id=#{whId} and id=mat.id)
         ) t
         <where>
@@ -71,6 +71,7 @@
         </where>
         order by t.mat_code
     </select>
+
     <select id="selectNowByMatPnId" resultType="com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO">
         select * from v_storage_material_now where id=#{matId} and pn_id=#{pnId} order by mat_code
     </select>

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue

@@ -17,12 +17,16 @@
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="排除库存为0的物料?" prop="noZero" v-if="false">
+      <el-form-item label="排除库存为0的物料?" prop="noZero" >
-        <el-radio-group v-model="formData.noZero">
+        <el-switch
-          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.value">
+          v-model="noZeroSwich"
-            {{ dict.label }}
+          inline-prompt
-          </el-radio>
+          active-text="是"
-        </el-radio-group>
+          inactive-text="否"
+        />
+        <!-- <el-radio-group v-model="formData.noZero">
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :value="dict.value" :label="dict.label"/>
+        </el-radio-group> -->
       </el-form-item>
       
       
@@ -47,7 +51,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const router = useRouter()
-
+const noZeroSwich = ref(false)
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -104,6 +108,10 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    console.log(noZeroSwich.value)
+    if(noZeroSwich.value == true){
+      formData.value.noZero = 1;
+    }
     const data = formData.value as unknown as StorageCheckApi.StorageCheckVO
     data.status = 1
     if (formType.value === 'create') {

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue

@@ -55,17 +55,24 @@
             </el-row>
           </el-col>
           <el-col :span="8">
-            <!-- <el-row>
+            <el-row>
               <el-col :span="24">
-                <el-form-item label="排除库存为0的物料?" prop="noZero">
+                <el-form-item label="排除库存为0的物料?" prop="noZero" >
-                  <el-radio-group v-model="formData.noZero" disabled>
+                  <el-switch
+                      v-model="noZeroSwich"
+                      inline-prompt
+                      active-text="是"
+                      inactive-text="否"
+                      disabled="true"
+                    />
+                  <!-- <el-radio-group v-model="formData.noZero" disabled>
                     <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.value">
                       {{ dict.label }}
                     </el-radio>
-                  </el-radio-group>
+                  </el-radio-group> -->
                 </el-form-item>
               </el-col>
-            </el-row> -->
+            </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item label="盘点开始日期" prop="checkTime">
@@ -92,7 +99,7 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-button class="hl-addbutton" type="primary" size="large" v-bind:disabled="ctrView || ctrSave" @click="openMatForm">获取物料</el-button>
+                <el-button class="hl-addbutton" type="primary" size="large" :disabled="ctrView || ctrSave" @click="openMatForm">获取物料</el-button>
               </el-col>
               <el-form ref="matSubFormRef" :model="formData.matItemDOList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.matItemDOList" class="hl-table">
@@ -107,7 +114,7 @@
                     <template #header> <span class="hl-table_header">*</span>库区 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
-                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="(val)=>handleRg(val,scope)" v-bind:disabled="ctrView || ctrSave">
+                        <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="(val)=>handleRg(val,scope)" :disabled="ctrView || ctrSave">
                           <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rg_name" :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -117,7 +124,7 @@
                     <template #header> <span class="hl-table_header">*</span>库位 </template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
-                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" @change="(val)=>handlePn(val,scope)" v-bind:disabled="ctrView || ctrSave">
+                        <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" @change="(val)=>handlePn(val,scope)" :disabled="ctrView || ctrSave">
                           <el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name" :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -128,7 +135,7 @@
                     <template #header> <span class="hl-table_header">*</span>盘点数量</template>
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty" class="mb-0px!">
-                        <el-input v-model="scope.row.storageOkQty" @change="(val)=>handleSub(val,scope)" v-bind:disabled="ctrView || ctrSave" />
+                        <el-input v-model="scope.row.storageOkQty" @change="(val)=>handleSub(val,scope)" :disabled="ctrView || ctrSave" />
                       </el-form-item>
                     </template>
                   </el-table-column> 
@@ -163,10 +170,10 @@
                   <el-table-column prop="matUnit" label="库存单位" min-width="120" align="center" />
                   <el-table-column label="操作" align="center" width="240">
                     <template #default="scope" >
-                      <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)" v-bind:disabled="ctrView || ctrDelete" v-if="scope.row.isCopy==1">
+                      <el-button link type="danger" size="small" @click.prevent="handleDelete2(scope.$index)" :disabled="ctrView || ctrDelete" v-if="scope.row.isCopy==1">
                         删除
                       </el-button>
-                      <el-button link type="primary" v-if="scope.row.isCopy==0" @click="handleCopy(scope.$index, scope.row)" v-bind:disabled="ctrView || ctrDelete">复制</el-button>
+                      <el-button link type="primary" v-if="scope.row.isCopy==0" @click="handleCopy(scope.$index, scope.row)" :disabled="ctrView || ctrDelete">复制</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
@@ -184,11 +191,12 @@
           <el-col>
             <el-card class="hl-incard">
               <el-col>
-                <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :headers="{
+                <el-upload
+ref="matUploadRef" :file-list="matUploadFiles" multiple :action="uploadUrl" :headers="{
                     Authorization: 'Bearer ' + getAccessToken(),
                     'tenant-id': getTenantId()
                   }" name="files" :show-file-list="false" :auto-upload="false" :data="matUploadData" :on-change="matUploadChange" :on-error="handleError" :on-success="handleSuccess" :before-upload="before" class="upload-file-uploader">
-                  <el-button type="primary" v-bind:disabled="ctrView || ctrSave">
+                  <el-button type="primary" :disabled="ctrView || ctrSave">
                     <Icon icon="ep:upload-filled" />上传
                   </el-button>
                 </el-upload>
@@ -204,10 +212,10 @@
 
                 <el-table-column label="操作" align="center">
                   <template #default="scope">
-                    <el-button link type="danger" size="small" @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)" v-bind:disabled="ctrView || ctrDelete">
+                    <el-button link type="danger" size="small" @click="handleDeleteAttachment(scope.$index, scope.row.businessFileType)" :disabled="ctrView || ctrDelete">
                       删除
                     </el-button>
-                    <el-button link type="primary" size="small" @click="downloadAttachment(scope.row.name, scope.row.url)" v-bind:disabled="ctrView || ctrDelete">
+                    <el-button link type="primary" size="small" @click="downloadAttachment(scope.row.name, scope.row.url)" :disabled="ctrView || ctrDelete">
                       下载
                     </el-button>
                   </template>
@@ -259,9 +267,35 @@
             </el-form-item>
           </el-col>
         </el-row> -->
+        <el-dialog v-model="centerDialogVisible" title="提醒" width="30%" center>
+				<span>
+					提交后将修改库存数量，是否继续！
+				</span>
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="centerDialogVisible = false">取消</el-button>
+						<el-button type="primary" @click="sureToSubmit()">
+							确认
+						</el-button>
+					</span>
+				</template>
+			</el-dialog>
+      <el-dialog v-model="deleteDialogVisible" title="提醒" width="30%" center>
+				<span>
+					删除后单据将被作废，是否继续！
+				</span>
+				<template #footer>
+					<span class="dialog-footer">
+						<el-button @click="deleteDialogVisible = false">取消</el-button>
+						<el-button type="primary" @click="sureToDelete()">
+							确认
+						</el-button>
+					</span>
+				</template>
+			</el-dialog>
       </el-card>
     </el-form>
-    <div class="text-center hl-footer">
+    <div class="hl-footer text-center">
       <el-button @click="() => router.go(-1)" size="large">取 消</el-button>
       <el-button @click="submitForm" type="success" v-if="btnSave" size="large">保
         存</el-button>
@@ -296,15 +330,16 @@ import * as PnApi from '@/api/heli/pn'
 import type { UploadUserFile } from 'element-plus'
 import { deleteFile, downloadFile, getFilePage } from '@/api/infra/file'
 import download from '@/utils/download'
-import materials from './materials.vue'
+import materials from './materialsNew.vue'
 
 const reload: any = inject('reload')
-
+const centerDialogVisible = ref(false)
+const deleteDialogVisible = ref(false)
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { query } = useRoute()
 const router = useRouter()
-
+const noZeroSwich = ref(false)
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formData = ref({
@@ -352,6 +387,7 @@ const subFormRules = reactive({
   money: [{ required: true, message: '金额不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
+  formData.value.status = num
   if (num == 2) {
     // 校验表单
     await formRef.value.validate()
@@ -381,21 +417,27 @@ const handleStatus = async (num) => {
       return
     }
     formData.value.keeper = useUserStore().getUser.id
-    formData.value.status = num
     //保存表单数据
     await saveFormData()
     await CheckApi.updateStorageCheckStatus(formData.value.id)
+    await initStatus(formData.value.status)
+    if (sumbefore.value == 0) {
+      reload()
+    }
   } else {
-    formData.value.cancel = useUserStore().getUser.id
+    deleteDialogVisible.value = true;
-    const data = formData.value as unknown as CheckApi.StorageCheckVO
-    await CheckApi.updateStorageCheck(data)
-  }
-  await initStatus(formData.value.status)
-  if (sumbefore.value == 0) {
-    reload()
   }
 }
-
+const sureToDelete = async() =>{
+    formData.value.cancel = useUserStore().getUser.id
+    const data = formData.value as unknown as CheckApi.StorageCheckVO
+    deleteDialogVisible.value = false;
+    await CheckApi.updateStorageCheck(data)
+    await initStatus(formData.value.status)
+    if (sumbefore.value == 0) {
+      reload()
+    }
+}
 const getList = async (arrMat) => {
   arrMat.forEach((row) => {
     row.cid = matCount
@@ -580,13 +622,26 @@ const saveFormData = async () => {
     formLoading.value = false
   }
 }
+const sureToSubmit = async() =>{
+  centerDialogVisible.value = false;
+  //保存表单数据
+  await saveFormData()
+
+  await initStatus(formData.value.status)
+
+  // 成功后刷新
+  if (sumbefore.value == 0) {
+    reload()
+  }
+}
+
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  // if (formData.value.matItemDOList == undefined || formData.value.matItemDOList.length === 0) {
+  if (formData.value.matItemDOList == undefined || formData.value.matItemDOList.length === 0) {
-  //   message.alertWarning('请添加物料信息!')
+    message.alertWarning('请添加物料信息!')
-  //   return
+    return
-  // }
+  }
 
   // 校验子表单
   try {
@@ -604,19 +659,13 @@ const submitForm = async () => {
       message.alertWarning('存在相同库位的物料信息,请修改,避免重复盘点!')
       return
     }
+
+
     await matSubFormRef.value.validate()
   } catch (e) {
     return
   }
-  //保存表单数据
+  centerDialogVisible.value = true;
-  await saveFormData()
-
-  await initStatus(formData.value.status)
-
-  // 成功后刷新
-  if (sumbefore.value == 0) {
-    reload()
-  }
 }
 
 var matCount = 1
@@ -748,7 +797,9 @@ onMounted(async () => {
   dialogTitle.value = query.type === 'update' ? '编辑页' : '详情页'
 
   formData.value = await CheckApi.getStorageCheck(query.id)
-
+  if(formData.value.noZero != 2){
+    noZeroSwich.value = true
+  }
   // 页面控件可视初始化
   await initStatus(formData.value.status)
 

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materialsNew.vue

@@ -0,0 +1,179 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="80%">
+    <ContentWrap class="borderxx">
+      <el-form class="-mb-15px" :model="queryReqVo" :inline="true" label-width="108px">
+        <el-form-item label="物料类型：">
+          <el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-180px" :disabled="!chkboxEnable" @keyup.enter="handleQuery">
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label" :label="dict.label" :value="dict.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label=" 物料名称/编码：" label-width="150px">
+          <el-input v-model="queryReqVo.matCode" @keyup.enter="handleQuery" placeholder="物料名称/编码" class="!w-180px" :disabled="!chkboxEnable" />
+        </el-form-item>
+        <el-form-item label=" 规格/型号：" label-width="150px">
+          <el-input v-model="queryReqVo.matSpec" @keyup.enter="handleQuery" placeholder="规格/型号" class="!w-180px" :disabled="!chkboxEnable" />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery" type="primary" :disabled="!chkboxEnable">
+            <Icon icon="ep:search" class="mr-5px" /> 搜索
+          </el-button><el-button @click="resetQuery" :disabled="!chkboxEnable">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+    <el-card class="hl-table">
+      <el-table ref="multipleTable" :data="list" v-loading="formLoading" class="hl-table" @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800" @row-click="clickRow">
+        <el-table-column type="selection" width="55" v-if="chkboxEnable" :reserve-selection="true" :selectable="row=>chkboxEnable" />
+        <!-- <el-table-column prop="no" label="序号" min-width="120" align="center" /> -->
+        <el-table-column label="序号" type="index" min-width="120" align="center" />
+        <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
+        <el-table-column prop="matName" label="物料名称" min-width="180" align="center" />
+        <el-table-column prop="matType" label="物料类型" min-width="120" align="center" />
+        <el-table-column prop="shortName" label="物料简称" min-width="120" align="center" />
+        <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+        <el-table-column prop="matBrand" label="品牌" min-width="120" align="center" />
+        <el-table-column prop="rgName" label="库区" min-width="120" align="center" />
+        <el-table-column prop="pnName" label="库位" min-width="140" align="center" />
+        <el-table-column prop="storageOkQty" label="库存数量" min-width="120" align="center" />
+        <el-table-column prop="matUnit" label="库存单位" min-width="120" align="center" />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination :total="total" v-model:page="queryReqVo.pageNo" v-model:limit="queryReqVo.pageSize" @pagination="getList()" />
+    </el-card>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as StorageLogApi from '@/api/heli/storagelog'
+import { ElTable } from 'element-plus'
+
+//:selectable="row=>row.disabled || chkboxEnable"
+const chkboxEnable = ref(true)
+const queryEnable = ref(true)
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const list = ref([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+
+const multipleTable = ref<InstanceType<typeof ElTable>>()
+const multipleSelection = ref([])
+const handleSelectionChange = (val: []) => {
+  multipleSelection.value = val
+}
+
+const clickRow = (row: any) => {
+  if (chkboxEnable.value) {
+    if (row) {
+      multipleTable.value!.toggleRowSelection(row, undefined)
+    } else {
+      multipleTable.value!.clearSelection()
+    }
+  }
+}
+//指定key值,数据更新之后保留之前选中的数据
+const getRowKeys = (row) => {
+  return row.matId
+}
+
+const queryReqVo: any = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  noZero: undefined,
+  whId: undefined,
+  matCode: undefined,
+  matType: undefined,
+  matSpec: undefined,
+  isAll:false,
+})
+/** 搜索按钮操作 */
+const handleQuery = async () => {
+  queryReqVo.pageNo = 1
+  getList()
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryReqVo.matCode = ''
+  queryReqVo.matType = ''
+  queryReqVo.matSpec = ''
+  handleQuery()
+}
+
+const overall = ref()
+const overallnum = ref()
+const getList = async () => {
+  formLoading.value = true
+  try {
+    const data = await StorageLogApi.getStorageNowList(queryReqVo)
+    total.value = Math.max(1, data.length)
+    overallnum.value = data.length
+    list.value = data.splice((queryReqVo.pageNo - 1) * queryReqVo.pageSize, queryReqVo.pageSize)
+  } finally {
+    formLoading.value = false
+  }
+}
+const overallList = async () => {
+  // queryReqVo.pageSize = overallnum.value
+  queryReqVo.isAll = true
+  const data1 = await StorageLogApi.getStorageNowList(queryReqVo)
+  // queryReqVo.pageSize = 10
+  handleSelectionChange(data1)
+}
+
+/** 打开弹窗 */
+const open = async (noZero: number, whId?: number, isAll?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = '物料列表'
+
+  // 修改时，设置数据
+  queryReqVo.noZero = noZero
+  queryReqVo.whId = whId
+  queryReqVo.matCode = ''
+  queryReqVo.matType = ''
+
+  // formLoading.value = true
+  // const data = await StorageLogApi.getStorageNowList(queryReqVo)
+  // list.value = data.list
+  // total.value = data.total
+  getList()
+  chkboxEnable.value = isAll === 2 ? false : true
+  if (isAll == 2) {
+    getList()
+    overallList()
+  }
+  try {
+    // 获取物料库存实时列表
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 提交请求
+  formLoading.value = true
+  try {
+    dialogVisible.value = false
+    multipleSelection.value.forEach((item) => {
+      item.matRest = item.storageOkQty
+      item.storageOkQty = ''
+    })
+    // 发送操作成功的事件
+    emit('success', multipleSelection.value)
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>

mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, computed, ref } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
-import { getListAPI, getDictAPI,postOperateAPIZF } from '@/services/pgMaster'
+import { getListAPI, getDictAPI,postOperateAPIZF ,getListAPIWX} from '@/services/pgMaster'
 import { useLoginStore } from '@/stores/modules/login'
 import { formatDate } from '@/utils/index'
 
@@ -49,7 +49,7 @@ const getListData = async () => {
   }
   isLoading.value = true
   // 发送请求
-  const data = await getListAPI(queryParams)
+  const data = await getListAPIWX(queryParams)
   isLoading.value = false
   data.list.forEach((e) => {
     e.orderTime = formatDate(e.orderTime, 'YYYY-MM-DD')

mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, computed, ref } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
-import { getListAPI, getDictAPI,postOperateAPIZF } from '@/services/zjPgMaster'
+import { getListAPI, getDictAPI,postOperateAPIZF,getListAPIWx } from '@/services/zjPgMaster'
 import { useLoginStore } from '@/stores/modules/login'
 import { formatDate } from '@/utils/index'
 
@@ -47,7 +47,7 @@ const getListData = async () => {
   }
   isLoading.value = true
   // 发送请求
-  const data = await getListAPI(queryParams)
+  const data = await getListAPIWx(queryParams)
   isLoading.value = false
   data.list.forEach((e) => {
     e.orderTime = formatDate(e.orderTime, 'YYYY-MM-DD')

mes-ui/mini-app/src/services/pgMaster.ts

@@ -15,7 +15,13 @@ export const getListAPI = (data: Object) => {
     data,
   })
 }
-
+export const getListAPIWX = (data: Object) => {
+  return http<any[]>({
+    method: 'GET',
+    url: '/heli/pg-master/task-dispatch-detail/pageWx',
+    data,
+  })
+}
 /**
  * 操作生产任务（开始/结束/提交/完成）
  */

mes-ui/mini-app/src/services/zjPgMaster.ts

@@ -15,6 +15,13 @@ export const getListAPI = (data: Object) => {
     data,
   })
 }
+export const getListAPIWx = (data: Object) => {
+  return http<any[]>({
+    method: 'GET',
+    url: '/heli/zj-pg-master/task-dispatch-detail/pageWx',
+    data,
+  })
+}
 // 报工记录分页查询
 export const getTaskRepotPageAPI = (data: Object) => {
   return http<any[]>({