托书调整，出运明细更改请求

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

@@ -385,7 +385,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	 */
 	@AutoLog(value = "发运明细主表-批量删除")
 	//@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
+	@PostMapping(value = "/deleteBatch")
 	public Result<Integer> deleteBatch(String ids,String itemId) {
 
 		Result<Integer> result = new Result<>();
@@ -944,13 +944,15 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		  List<String> idsList = new ArrayList<>();
 
-		  List<String> submitListId = syShippingDetails.getSubmitListId();
+		  //获取分组ID
+		  List<String> submitListId = syShippingDetails.getGrouyIdList();
 		  for(String str:submitListId ){
-		  	String idsArray[] = str.split(",");
-
-		  	for(String arr:idsArray){
-				idsList.add(arr);
-			}
+			  idsList.add(str);
+//		  	String idsArray[] = str.split(",");
+//
+//		  	for(String arr:idsArray){
+//				idsList.add(arr);
+//			}
 		  }
 
 
@@ -1029,7 +1031,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  }else{
 				  // 查询是否已提交
 				  QueryWrapper<SyShippingDetailsItem> itemQueryWrapper1 = new QueryWrapper<>();
-				  itemQueryWrapper1.in("id", idsList).eq("submit_status", "1");
+				  itemQueryWrapper1.in("group_id", idsList).eq("submit_status", "1");
 				  List<SyShippingDetailsItem> list1 = syShippingDetailsItemService.list(itemQueryWrapper1);
 
 				  for (SyShippingDetailsItem li : list1) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -236,7 +236,7 @@ ${ew.customSqlSegment}
         update sy_shipping_details_item
         <if test='type == "1"'>
             set submit_status = 1
-            where id in
+            where group_id in
             <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -244,7 +244,7 @@ ${ew.customSqlSegment}
 
         <if test='type == "2"'>
             set submit_status = 0
-            where id in
+            where group_id in
             <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
                 #{item}
             </foreach>

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

@@ -692,16 +692,18 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         for(Map<String,Object> li: itemList){
 
             if(rmbList.size()!=0) {
-
+                int index = 0;
                 //人民币信息
                 for (Map<String, Object> rmb : rmbList) {
                     String id = "";
-                    int index = 0;
+
                     index++;
                     //ID
                     if(index < 10){
+                        Thread.sleep(500);
                          id = sf2.format(new Date())+"0"+index;
                     }else {
+                         Thread.sleep(500);
                          id = sf2.format(new Date()) + index;
                     }
                     ii++;
@@ -766,15 +768,18 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             }
 
             if(usdList.size()!=0) {
+                int index = 0;
                 //美元信息
                 for (Map<String, Object> usd : usdList) {
                     String id = "";
-                    int index = 0;
                     index++;
                     //ID
                     if(index < 10){
+					    Thread.sleep(500);
                         id = sf2.format(new Date())+"0"+index;
+                        
                     }else {
+                        Thread.sleep(500);
                         id = sf2.format(new Date()) + index;
                     }
 
@@ -823,7 +828,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     Double  imoney = money * Double.parseDouble(usd.get("amount").toString());
 
                     maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
-                    maps.put("INatMoney", df.format(imoney*Double.parseDouble(nflat)));
+                    Double usdMoney = Double.parseDouble(df.format(imoney))*Double.parseDouble(nflat);
+                    maps.put("INatMoney", df.format(usdMoney));
+//                    System.out.println("调整前："+df.format(imoney*Double.parseDouble(nflat)));
+//                    System.out.println("调整后："+df.format(usdMoney));
                     maps.put("iMoney", df.format(imoney));
                     maps.put("cExpCode",usd.get("itemColumn"));//项目编码
                     maps.put("ID", id);