Merge remote-tracking branch 'origin/dev_temp_xw_20250305_45455' into uat-temp-wj-chongqingdaqu-dev

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardReqModel;
 import cn.estsh.i3plus.ext.mes.pojo.model.board.MesWorkOrderBoardResModel;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.*;
@@ -80,4 +81,5 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
     @ApiOperation(value = "根据工单状态改变--关闭拉动但")
      void doCloseKittingOrder(MesWorkOrder mesWorkOrder,String userName);
 
+    void setBean(MesWorkOrder bean, DdlPackBean packBean);
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesCutSchemeController.java

@@ -1,11 +1,20 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutScheme;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 裁片工单
  */

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.MesExcelTool;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
@@ -248,5 +249,29 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
         }
     }
 
+    /**
+     * 查询信息 分页 + 组合
+     *
+     * @param bean
+     * @param pager
+     * @return
+     */
+    @GetMapping(value = "/queryAll")
+    @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
+    public ResultBean<MesWorkOrder> queryAll(MesWorkOrder bean, Pager pager) {
+        try {
+            bean.setOrganizeCode(AuthUtilExt.getOrganizeCode());
+            //bean.setOrganizeCode("ck01");
+
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+            mesWorkOrderService.setBean(bean, packBean);
 
+            ListPager<MesWorkOrder> listPager = getBaseService().queryPagerWhere(pager, packBean);
+            return ResultBean.success("操作成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setListPager(listPager);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e);
+        }
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCutSchemeService.java

@@ -6,13 +6,16 @@ import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.*;
+import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeMaterialRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import org.testng.util.Strings;
 
 import java.util.List;
 import java.util.Map;
@@ -24,6 +27,8 @@ public class MesCutSchemeService extends BaseMesService<MesCutScheme> implements
 
     @Autowired
     private MesWorkCenterRepository workCenterRepository;
+    @Autowired
+    private MesCutSchemeMaterialRepository cutSchemeMaterialRepository;
 
     protected void setPackQueryBean(MesCutScheme bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
@@ -91,4 +96,25 @@ public class MesCutSchemeService extends BaseMesService<MesCutScheme> implements
         //    }
         //}
     }
+
+    //查询后执行
+    public void afterList(List<MesCutScheme> mesCutSchemes) {
+
+        List<String> cutCodes = mesCutSchemes.stream().map(MesCutScheme::getCutCode).collect(Collectors.toList());
+
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(AuthUtil.getOrganizeCode());
+        DdlPreparedPack.getInPackList(cutCodes, "cutCode", ddlPackBean);
+        List<MesCutSchemeMaterial> mesCutSchemeMaterials = cutSchemeMaterialRepository.findByHqlWhere(ddlPackBean);
+        if (CollectionUtils.isEmpty(mesCutSchemeMaterials)) {
+            return;
+        }
+        Map<String,List<MesCutSchemeMaterial>> materialMap = mesCutSchemeMaterials.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
+
+        for (MesCutScheme mesCutScheme : mesCutSchemes) {
+            List<MesCutSchemeMaterial> list = materialMap.get(mesCutScheme.getCutCode());
+            mesCutScheme.setPartNos(list.stream().map(MesCutSchemeMaterial::getPartNo).map(String::valueOf).collect(Collectors.joining(",")));
+        }
+
+
+    }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java

@@ -265,7 +265,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
 
                 if (order.getUnCompleteQty().compareTo(totalQty) >= 0) {
                     workOrderUnCompleteMap.put(order.getWorkOrderNo(), MathOperation.sub(order.getUnCompleteQty(), totalQty));
-                    workOrderQtyMap.put(order.getWorkOrderNo(), totalQty);
+                    workOrderQtyMap.put(order.getWorkOrderNo(), cutSchemeFg.getQty());
                     totalQty = 0.0;
                 } else {
                     workOrderUnCompleteMap.put(order.getWorkOrderNo(), 0.0);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -342,12 +342,20 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             }
         }
     }
+    public void setBean(MesWorkOrder bean, DdlPackBean packBean) {
+        setPackQueryBean(bean, packBean);
+    }
+
     @Override
     protected void setPackQueryBean(MesWorkOrder bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getPartName(), MesExtConstWords.PART_NAME, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), MesExtConstWords.CREATE_USER, packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
+        String partNo = bean.getPartNo();
+        if (!StringUtil.isEmpty(partNo)) {
+            List<String> partNoList = Arrays.asList(partNo.split(","));
+            DdlPreparedPack.getInPackList(partNoList, MesExtConstWords.PART_NO, packBean);
+        }
         DdlPreparedPack.getStringEqualPack(bean.getCustPartNo(), MesExtConstWords.CUST_PART_NO, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getVinCode(), MesExtConstWords.VIN_CODE, packBean);