装配目视单预览

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

@@ -49,6 +49,10 @@ public interface IMesWorkOrderService extends IBaseMesService<MesWorkOrder> {
     @ApiOperation("装配目视单补打")
     List<Map<String, Object>> doReprintWorkOrder(Long[] ids, String organizeCode, String userName);
 
+    @ApiOperation("装配目视单预览")
+    List<Map<String, Object>> doShowWorkOrderPrint(String partNo, String workCenterCode, String partProdGroupCode,
+                                                   String carModelCode, String organizeCode, String userName);
+
     List<MesProductionRecord> getPreDayReportMesProductionRecord(String organizeCode , List<MesShift> mesShiftList, String  workCenterCode);
 
     List<MesProduceSn> getPreDayReportMesProduceSn(String organizeCode ,List<MesProductionRecord> mesProductionRecordList );

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

@@ -200,13 +200,14 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
 
     @PostMapping(value = "/work-order-reprint")
     @ApiOperation(value = "装配目视单补打")
-    public ResultBean doSaveWorkOrderPrintQueue(@RequestBody Long[] ids) {
+    public ResultBean doReprintWorkOrder(Long[] ids) {
         try {
 
             ValidatorBean.checkNotNull(ids,"工单不能为空");
 
-            mesWorkOrderService.doReprintWorkOrder(ids, AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
+            return ResultBean.success("装配目视单补打成功")
-            return ResultBean.success("装配目视单补打成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+                    .setResultObject(mesWorkOrderService.doReprintWorkOrder(ids, AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName()))
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {
@@ -214,6 +215,7 @@ public class MesWorkOrderController extends BaseMesController<MesWorkOrder> {
         }
     }
 
+
     @PutMapping(value = "/reopen")
     @ApiOperation(value = "重新打开")
     public ResultBean doReopen(Long[] ids) {

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

@@ -142,6 +142,9 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     @Autowired
     private IMesPartProdGroupService partProdGroupService;
 
+    @Autowired
+    private IMesPrintedSnLogRepository printedSnLogRepository;
+
     @Override
     public MesWorkOrder insert(MesWorkOrder bean) {
         //校验产线与工位的关系
@@ -1180,8 +1183,16 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
     @Override
     public List<Map<String, Object>> doReprintWorkOrder(Long[] ids, String organizeCode, String userName) {
 
+        // 根据id 获取工单数据
         List<MesWorkOrder> mesWorkOrderList = getMesWorkOrderList(ids, organizeCode);
 
+        List<Map<String, Object>> resultMapList = packPrintResultMap(organizeCode, mesWorkOrderList, userName);
+
+        return resultMapList;
+
+    }
+
+    private List<Map<String, Object>> packPrintResultMap(String organizeCode, List<MesWorkOrder> mesWorkOrderList, String userName) {
         // 根据工单号对工单分组
         Map<String, MesWorkOrder> workOrderMapByWorkOrderNo = mesWorkOrderList.stream().collect(Collectors.toMap(MesWorkOrder::getWorkOrderNo, Function.identity(), (x, y) -> y));
 
@@ -1209,6 +1220,9 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         // 返回结果
         List<Map<String, Object>> resultMapList = new ArrayList<>();
 
+        // 条码打印
+        List<MesPrintedSnLog> printedSnLogList = new ArrayList<>();
+
         for (MesWorkOrder mesWorkOrder : mesWorkOrderList) {
 
             if (mesWorkOrder == null) {
@@ -1262,12 +1276,38 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
                 MesException.throwMesBusiException("工单【%s】关联零件生产组【%s】打印模板【%s】策略类【%s】执行异常", mesWorkOrder.getWorkOrderNo(), mesWorkOrder.getPartProdGroupCode(), labelTemplate.getTemplateCode(), labelTemplate.getMethodCode());
             }
 
+            MesPrintedSnLog printedSnLog = new MesPrintedSnLog();
+            printedSnLog.setOrganizeCode(mesWorkOrder.getOrganizeCode());
+            printedSnLog.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
+            printedSnLog.setCustPartNo(mesWorkOrder.getCustPartNo());
+            ConvertBean.serviceModelInitialize(printedSnLog, userName);
+            printedSnLogList.add(printedSnLog);
+
             resultMapList.addAll(snPrintModel.getPrintContextList());
 
         }
 
+        if (!CollectionUtils.isEmpty(printedSnLogList)) printedSnLogRepository.saveAll(printedSnLogList);
+
         return resultMapList;
+    }
+
+    @Override
+    public List<Map<String, Object>> doShowWorkOrderPrint(String partNo, String workCenterCode, String partProdGroupCode,
+                                                          String carModelCode, String organizeCode, String userName) {
+
+        DdlPackBean packBean =  DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringEqualPack(workCenterCode, MesExtConstWords.WORK_CENTER_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(partProdGroupCode, MesExtConstWords.PART_PROD_GROUP_CODE, packBean);
+        DdlPreparedPack.getStringEqualPack(carModelCode, MesExtConstWords.CAR_MODEL_CODE, packBean);
+        packBean.setOrderByStr(" order by createDatetime desc ");
+        MesWorkOrder workOrder = workOrderRepository.getByProperty(packBean);
+
+        List<MesWorkOrder> workOrderList = new ArrayList<>();
+        workOrderList.add(workOrder);
 
+        return packPrintResultMap(organizeCode, workOrderList, userName);
     }
 
     private Map<String, MesCustomerCarModel> getMesCustomerCarModelMap(String organizeCode, List<MesWorkOrder> workOrderList) {