拉动单补打并且插入PrintedSnLog表

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesPullingOrderInfo;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -14,4 +15,6 @@ public interface IMesPullingOrderInfoService extends IBaseMesService<MesPullingO
     Map doSPSForEquipment( String assemblyLine, String pullingGroupCode,String organizeCode );
 
     void doCreatePullOrderByPullGroupAndWorkOrder(String organizeCode, String userName);
+
+    List<MesPullingOrderInfo> doMesPullingOrderInfoPrint(MesPullingOrderInfo mesPullingOrderInfo, String userName);
 }

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

@@ -1,11 +1,23 @@
 package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
 
+import cn.estsh.i3plus.ext.mes.api.base.IMesPullingOrderInfoService;
 import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesPullingOrderInfo;
+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.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 拉动单
  */
@@ -13,4 +25,24 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(MesCommonConstant.MES_YANFEN + "/mesPullingOrderInfo")
 public class MesPullingOrderInfoController extends BaseMesController<MesPullingOrderInfo> {
+    @Autowired
+    private IMesPullingOrderInfoService mesPullingOrderInfoService;
+
+    @GetMapping(value = "/doRePrint")
+    @ApiOperation(value = "拉动单补打")
+    public ResultBean doMesPullingOrderInfoPrint(MesPullingOrderInfo mesPullingOrderInfo) {
+        try {
+            if (StringUtils.isEmpty(mesPullingOrderInfo.getPullingOrderNo())) {
+                throw new ImppBusiException("拉动单号不能为空");
+            }
+            List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoService.doMesPullingOrderInfoPrint(mesPullingOrderInfo, AuthUtil.getSessionUser().getUserName());
+            return ResultBean.success("拉动单打印成功")
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultList(pullingOrderInfos);
+        } catch (ImppBusiException e) {
+            return ResultBean.fail(e).build();
+        } catch (Exception e) {
+            return ResultBean.fail(e);
+        }
+    }
 }

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

@@ -71,7 +71,7 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
 
     @GetMapping(value = "/ship-part/query-item-part")
     @ApiOperation(value = "发运零件子零件明细")
-    public ResultBean queryDetailMesWorkOrderPart(@RequestBody MesWorkOrderPart detail, Pager pager) {
+    public ResultBean queryDetailMesWorkOrderPart(MesWorkOrderPart detail, Pager pager) {
         try {
 
             detail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());
@@ -86,7 +86,7 @@ public class MesShippingOrderManagementDetailController extends BaseMesControlle
     }
     @GetMapping(value = "/ship-order/query-item-part")
     @ApiOperation(value = "发运单子零件明细")
-    public ResultBean queryMesShippingOrderManagementDetail(@RequestBody MesWorkOrderPart detail, Pager pager) {
+    public ResultBean queryMesShippingOrderManagementDetail(MesWorkOrderPart detail, Pager pager) {
         try {
 
             detail.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode());

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

@@ -54,7 +54,8 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
     private MesWorkCenterRepository mesWorkCenterRepository;
     @Autowired
     private MesPullingOrderExtendsRepository mesPullingOrderExtendsRepository;
-
+    @Autowired
+    private IMesPrintedSnLogRepository snLogRao;
     protected void setPackQueryBean(MesPullingOrderInfo bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPullCode(), "pullCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBean);
@@ -296,10 +297,61 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
         ConvertBean.serviceModelUpdate(mesPullingOrder, "WS.SPS");
         baseRDao.update(mesPullingOrder);
         String message = "更新SPS状态成功，已发送SPS信息给设备! id:" + mesPullingOrder.getId() + "Code:" + mesPullingOrder.getPullingOrderNo() + "产线" + assemblyLine + "拉动组" + pullingGroupCode + "";
+        //查询拉动组明细
+        DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(mesPullingOrder.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesPullingOrder.getPullingOrderNo(), "pullingOrderNo", partPackBean);
+        List<MesPullingOrderPartInfo> pullingOrderPartInfos = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
+        if (!CollectionUtils.isEmpty(pullingOrderPartInfos)) {
+            mesPullingOrder.setPartList(pullingOrderPartInfos);
+        }
+        resultMap.put("orderInfo", mesPullingOrder);
         resultMap.put("success", true);
         resultMap.put("message", message);
 
 
         return resultMap;
     }
+    @Override
+    public List<MesPullingOrderInfo> doMesPullingOrderInfoPrint(MesPullingOrderInfo bean, String userName) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bean.getPullingOrderNo(), "pullingOrderNo", packBean);
+//        DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue(), "printStatus", packBean);
+        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());
+                DdlPreparedPack.getStringEqualPack(pullingOrderInfo.getPullingOrderNo(), "pullingOrderNo", partPackBean);
+                List<MesPullingOrderPartInfo> pullingOrderPartInfos = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
+                if (!org.springframework.util.CollectionUtils.isEmpty(pullingOrderPartInfos)) {
+                    pullingOrderInfo.setPartCount(pullingOrderPartInfos.size());
+                    pullingOrderInfo.setPullingOrderPartInfos(pullingOrderPartInfos);
+                }
+
+                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;
+    }
+
 }