FQC卷标打印 2022-05-20 sxm

src/main/java/com/gaotao/common/constant/OutBoxConstant.java

@@ -5,5 +5,7 @@ public class OutBoxConstant {
     public static final String COPIES = "COPIES";
     public static final String SEQ_NUMBER = "流水号";
 
-    public static final String PRINT_TYPE = "外箱标签打印-基于生产订单";
+    public static final String PRINT_TYPE_ORDER = "外箱标签打印-基于生产订单";
+
+    public static final String PRINT_TYPE_ROLL = "卷标签打印";
 }

src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java

@@ -173,7 +173,7 @@ public class OutBoxPrintServiceImpl implements OutBoxPrintService {
                 labelprinthist.setCreatedate(date);
                 labelprinthist.setUserid(outBoxParamVo.getUserName());
                 labelprinthist.setKeyinfo(StringUtils.isNotEmpty(outBoxParamVo.getOrderNo()) ? outBoxParamVo.getOrderNo() : outBoxParamVo.getRollNo());
-                labelprinthist.setPrintfrom(OutBoxConstant.PRINT_TYPE);
+                labelprinthist.setPrintfrom(StringUtils.isNotEmpty(outBoxParamVo.getOrderNo())?OutBoxConstant.PRINT_TYPE_ORDER:OutBoxConstant.PRINT_TYPE_ROLL);
                 labelprinthist.setPrintdetail(JSON.toJSONString(printOutMap));
                 histsList.add(labelprinthist);
             }

src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java

@@ -111,6 +111,10 @@ public class RollPrintServiceImpl implements RollPrintService {
                         }
                     }
                 }
+                // $数量 参数 有尾箱数 最后一箱数量变化
+                if (itemMap.containsValue("$数量")) {
+                    itemMap.put("数量", printData.get("数量"));
+                }
                 log.info("手工参数处理结束{}", paramMap.toString());
                 // 打印接口参数集
                 Map<String, Object> printOutMap = new HashMap<>();
@@ -133,7 +137,7 @@ public class RollPrintServiceImpl implements RollPrintService {
                 labelprinthist.setCreatedate(date);
                 labelprinthist.setUserid(rollParamVo.getUserName());
                 labelprinthist.setKeyinfo(rollParamVo.getRollNos().toString());
-                labelprinthist.setPrintfrom(OutBoxConstant.PRINT_TYPE);
+                labelprinthist.setPrintfrom(OutBoxConstant.PRINT_TYPE_ROLL);
                 labelprinthist.setPrintdetail(JSON.toJSONString(printOutMap));
                 histsList.add(labelprinthist);
             }

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1287,9 +1287,9 @@ public class ScheduleController {
      **/
     @PostMapping(value = "otherCreateSplitSfdcRoll")
     public R otherCreateSplitSfdcRoll(@RequestBody SearchScheduleData inData) {
-       scheduleService.otherCreateSplitSfdcRoll(inData);
+        String rollNos = scheduleService.otherCreateSplitSfdcRoll(inData);
         return R.ok("操作成功")
-                .put("code", 200);
+                .put("code", 200).put("rollNos",rollNos);
     }
 
     /**

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -736,7 +736,7 @@ public interface ScheduleService {
      * @Param inData
      * @return
      **/
-    void otherCreateSplitSfdcRoll(SearchScheduleData inData);
+    String otherCreateSplitSfdcRoll(SearchScheduleData inData);
 
     /**
      * @Author sxm

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3931,7 +3931,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     @Transactional
-    public void otherCreateSplitSfdcRoll(SearchScheduleData inData) {
+    public String otherCreateSplitSfdcRoll(SearchScheduleData inData) {
         List<Object> params = new ArrayList<>();
         params.add(inData.getSite());
         params.add(inData.getOrderNo());
@@ -3950,6 +3950,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             String msg = String.valueOf(resultMap.get("resultMsg"));
             throw new XJException(msg);
         }
+        return resultMap.get("rollNos").toString();
     }
 
     @Override

src/main/resources/mapper/print/LabelprinthistMapper.xml

@@ -7,7 +7,7 @@
         , Printfrom, ReportID, KeyInfo, UserID, CreateDate, PrintDetail
     </sql>
     <select id="getLabelPrintHistList" resultType="com.gaotao.modules.print.entity.Labelprinthist">
-        select id, Printfrom, ReportID, KeyInfo, UserID, CreateDate, PrintDetail
+        select top 1000 id, Printfrom, ReportID, KeyInfo, UserID, CreateDate, PrintDetail
         from Labelprinthist
         <where>
             <if test=" keyinfo != null and  keyinfo != ''">
@@ -29,7 +29,7 @@
                 and CreateDate &lt;= #{endDate}
             </if>
         </where>
-
+        order by CreateDate desc
     </select>
 
 </mapper>