把拉动单打印产线 拉动组多选

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesPartPullController.java

@@ -20,9 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * 拉动单
+ * 拉动组
  */
-@Api("拉动单")
+@Api("拉动组")
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN+ "/mesPartPull")
 public class MesPartPullController {
@@ -31,7 +31,7 @@ public class MesPartPullController {
     private IMesPartPullService mesPartPullService;
 
     @GetMapping(value = "/query")
-    @ApiOperation(value = "查询拉动单")
+    @ApiOperation(value = "查询拉动组")
     public ResultBean queryMesPartPull(MesPartPull mesPartPull) {
         try {
             mesPartPull.setOrganizeCode(mesPartPull.getOrganizeCode());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java

@@ -99,7 +99,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
             MesPcnException.throwMesBusiException("扫描拉动单号【%s】拉动单状态不是【已确认】", bean.getPullingOrderNo());
         }
 
-        //强过码 todo
+        //强过码 如果强过为true 不校验顺序 直接扫描完成修改状态为已扫描 todo
         if ((!Objects.isNull(bean.getIsPass()) && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == bean.getIsPass())) {
             mesPullingOrderInfo.setPullOrderStatus(MesExtEnumUtil.PULL_ORDER_STATUS.JIS_PULL.getValue());
             ConvertBean.serviceModelUpdate(mesPullingOrderInfo, userName);
@@ -109,11 +109,12 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
             DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
             DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
             DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PULL_ORDER_STATUS.KITTING_PULL.getValue(), "pullOrderStatus", packBean);
-            if (!StringUtil.isEmpty(bean.orderBy())) {
-                packBean.setOrderByStr(bean.orderBy());
-            } else {
-                DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
-            }
+//            if (!StringUtil.isEmpty(bean.orderBy())) {
+//                packBean.setOrderByStr(bean.orderBy());
+//            } else {
+            //顺序校验 根据未扫描单号 1 、2 、3，如果没有强过码 必须先扫1 再扫2
+            DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"pullingOrderNo"}, packBean);
+//            }
             List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean);
             if (!CollectionUtils.isEmpty(pullingOrderInfos)) {
                 //按照排序 依次扫描，如果扫描不按照顺序 报错
@@ -135,9 +136,14 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
     @Override
     public List<MesPullingOrderInfo> doMesPullingOrderInfoPrint(MesPullingOrderInfo bean, String userName) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
+        //多选
+        if(!StringUtil.isEmpty(bean.getPullCode())){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getPullCode().split(",")), "pullCode", packBean);
+        }
+        if(!StringUtil.isEmpty(bean.getWorkCenterCode())){
+            DdlPreparedPack.getInPackList(Arrays.asList(bean.getWorkCenterCode().split(",")), "workCenterCode", packBean);
+        }
         DdlPreparedPack.getStringEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBean);
-        DdlPreparedPack.getStringEqualPack(bean.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue(), "printStatus", packBean);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
         List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean);