45455 裁片生产过程控制，产品加工记录数量保存数据不对

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/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 = "/order/query")
+    @ApiOperation(value = "查询信息带分页", notes = "组合查询，外带分页功能")
+    public ResultBean<MesWorkOrder> queryByPager(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/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);