托书推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -747,7 +747,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  StringBuilder builder = new StringBuilder();
 				  StringBuilder builder1 = new StringBuilder();
 				  //获取尺码组
-				  List<SizeTable> sizeGroup = syPreAssembledPackingListItemMapper.querySize(syPreList.get(index).getId(),syPreList.get(index).getGroupId());
+				  List<SizeTable> sizeGroup = syPreAssembledPackingListItemMapper.querySize4(syPreList.get(index).getId(),syPreList.get(index).getGroupId());
 				  for(SizeTable si:sizeGroup){
 				  	  //尺码
 					  builder.append(si.getSize());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -644,8 +644,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd 00:00:00.000");
         DecimalFormat df = new DecimalFormat("#.00");
 
-        // ID= 年月日+0+毫秒
-        SimpleDateFormat sf2 = new SimpleDateFormat("yyyyMddSSS");
+        // ID= 年月日+毫秒
+        SimpleDateFormat sf2 = new SimpleDateFormat("20MddSSS");
         //记录每次单据号
         String cCode = "";
 
@@ -695,13 +695,25 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                 //人民币信息
                 for (Map<String, Object> rmb : rmbList) {
+                    String id = "";
+                    int index = 0;
+                    index++;
                     //ID
-                    String id = sf2.format(new Date());
+                    if(index < 10){
+                         id = sf2.format(new Date())+"0"+index;
+                    }else {
+                         id = sf2.format(new Date()) + index;
+                    }
                     ii++;
                     Map<String, Object> map = new HashMap<>();
                     Map<String, Object> mapPo;
 
                     String orderId = li.get("orderId").toString();
+                    if(orderId.indexOf("-") > 0){
+                        String idsplit[] = orderId.split("-");
+                        orderId = idsplit[0];
+                    }
+
                     mapPo = syShippingOrderMapper.querySOMain(orderId.substring(3, orderId.length()));//li.get("orderId").toString()
 
                     if (ii > 1) {
@@ -756,13 +768,25 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             if(usdList.size()!=0) {
                 //美元信息
                 for (Map<String, Object> usd : usdList) {
+                    String id = "";
+                    int index = 0;
+                    index++;
                     //ID
-                    String id = sf2.format(new Date());
+                    if(index < 10){
+                        id = sf2.format(new Date())+"0"+index;
+                    }else {
+                        id = sf2.format(new Date()) + index;
+                    }
+
                     ii++;
                     Map<String, Object> map = new HashMap<>();
                     Map<String, Object> mapPo;
 
                     String orderId = li.get("orderId").toString();
+                    if(orderId.indexOf("-") > 0){
+                        String idsplit[] = orderId.split("-");
+                        orderId = idsplit[0];
+                    }
                     mapPo = syShippingOrderMapper.querySOMain(orderId.substring(3, orderId.length()));//li.get("orderId").toString()
 
                     if (ii > 1) {