SPS单据打印插入PrintedSnLog表

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

@@ -56,6 +56,9 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
     @Autowired
     private IMesConfigService configService;
 
+    @Autowired
+    private IMesPrintedSnLogRepository snLogRao;
+
     @Override
     public ListPager<MesPullingOrderInfo> queryMesPullingOrderInfoByPager(MesPullingOrderInfo bean, Pager pager) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
@@ -176,6 +179,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean);
         if (!CollectionUtils.isEmpty(pullingOrderInfos)) {
             //把查出来的拉动单打印并修改打印状态为已打印
+            List<MesPrintedSnLog> snLogList = new ArrayList<>();
             for (MesPullingOrderInfo pullingOrderInfo : pullingOrderInfos) {
                 //查询拉动组明细
                 DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(pullingOrderInfo.getOrganizeCode());
@@ -188,9 +192,24 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
 
                 pullingOrderInfo.setPrintTime(TimeTool.getNowTime(true));
                 pullingOrderInfo.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());
+                pullingOrderInfo.setIsPrint(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                 ConvertBean.serviceModelUpdate(pullingOrderInfo, userName);
+
+                //10-12 打印补打拉动单新增log表
+                MesPrintedSnLog snLog = new MesPrintedSnLog();
+                snLog.setBarcode(pullingOrderInfo.getPullingOrderNo());
+                snLog.setCustPartNo(pullingOrderInfo.getCustPartNo());
+                snLog.setWorkOrderNo(pullingOrderInfo.getWorkOrderNo());
+                snLog.setPartNo(pullingOrderInfo.getPartNo());
+                snLog.setPartName(pullingOrderInfo.getPartName());
+                ConvertBean.serviceModelInitialize(snLog, userName);
+                snLog.setOrganizeCode(bean.getOrganizeCode());
+                snLogList.add(snLog);
+
             }
             mesPullingOrderInfoRepository.saveAll(pullingOrderInfos);
+            //保存打印条码记录
+            snLogRao.saveAll(snLogList);
         }
         return pullingOrderInfos;
     }
@@ -267,7 +286,7 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
         String rule = mesPartPullDetail.getRuleValidation();
         if (mesPullingOrderInfo.getScanValidationType() == MesExtEnumUtil.PART_PULL_DETAIL_SCAN_VALIDATION_TYPE.HOMEMADE_VALIDATE.getValue()) {
             List<MesProduceSn> produceSnList = mesProduceSnExtService.getProduceSnList(mesPullingOrderInfo.getOrganizeCode(), mesPullingOrderInfo.getProductSn());
-            if(CollectionUtils.isEmpty(produceSnList)){
+            if (CollectionUtils.isEmpty(produceSnList)) {
                 return false;
             }
             return mesPartPullDetail.getPullPartNo().equals(produceSnList.get(0).getPartNo());