aps-确认报工时，生成分卷批次号规则更改

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportOutputServiceImpl.java

@@ -126,6 +126,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 apsReportOutputDo.setQrcode(qrCode);
                 resList.add(apsReportOutputDo);
             } else {//输出物料数量>1，或者单卷输出数量>1
+                //分卷开始初始化值
+                int j = 1;
                 for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
                     int outval = apsProcessOperationOutMaterDo.getOutval();
                     for (int i = 1; i <= outval; i++) {
@@ -137,15 +139,19 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                         apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
                         apsReportOutputDo.setLevel(req.getLevel());
                         //生成批次号
-                        //生成批次号
-                        SysSerialVo vo = new SysSerialVo();
-                        vo.setModulecode("aps_report_output_" + req.getInputBatchNumber().split("-")[0]);
-                        vo.setRuleTemplateStr(req.getInputBatchNumber().split("-")[0] + "-" + "@{serialNumber:#00}");
-                        vo.setResetrule("date:yyyyMM");
-                        vo.setIfautomaticreset("y");
-                        vo.setInitValue(0L);
-                        Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
-                        String code = codeData.get("code").toString();
+                        //不用走系统生成的批次号了，按照输入的批次号就行分卷就行
+                        String code = req.getInputBatchNumber() + "_" + j;
+                        j++;
+
+//                        //生成批次号
+//                        SysSerialVo vo = new SysSerialVo();
+//                        vo.setModulecode("aps_report_output_" + req.getInputBatchNumber());
+//                        vo.setRuleTemplateStr(req.getInputBatchNumber() + "-" + "@{serialNumber:#00}");
+//                        vo.setResetrule("date:yyyyMM");
+//                        vo.setIfautomaticreset("y");
+//                        vo.setInitValue(0L);
+//                        Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
+//                        String code = codeData.get("code").toString();
 
                         apsReportOutputDo.setOutputnumber(code);
                         JSONObject json = new JSONObject();