托书推送U8调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -702,10 +702,17 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 } else if (testName.equals("报关信息-申报要素")) {
 
 					 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\" + testName + ".xlsx");
+					 List<String> elmentid = new ArrayList<>();
 
-					 QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
-					 queryWrapper.eq("sy_shipping_order_item_id", entity.getId()).eq("del_flag", 0).groupBy("english_name");
-					 List<SyShippingOrderItem> itemList = syShippingOrderItemService.list(queryWrapper);
+//					 QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
+//					 queryWrapper.eq("sy_shipping_order_item_id", entity.getId()).eq("del_flag", 0).groupBy("elements_Id");
+//					 List<SyShippingOrderItem> itemList = syShippingOrderItemService.list(queryWrapper);
+					 List<SyShippingOrderItem> itemList = syShippingOrderMapper.elmentsList(entity.getId());
+
+					 for(SyShippingOrderItem li : itemList){
+
+						 elmentid.add(li.getId());
+					 }
 
 					 int i = 1;
 					 for (SyShippingOrderItem li : itemList) {
@@ -719,6 +726,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 						 //查询主表
 						 SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
+//						 QueryWrapper<SyDeclarationElements> entityQueryWrapper = new QueryWrapper<>();
+//						 entityQueryWrapper.eq("id",li.getElementsId()).groupBy("hs_code");
+//						 List<SyDeclarationElements> entityList = syDeclarationElementsService.list(entityQueryWrapper);
+//
 						 //查询子表
 						 QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
 						 itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0).orderByAsc("sort");
@@ -1254,95 +1265,101 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 List<Map<String,Object>> rmbmap = new ArrayList<>();
 		 List<Map<String,Object>> usdmap = new ArrayList<>();
 
-		 //查询主表信息
-		 SyShippingOrder entity = syShippingOrderService.getById(syShippingOrder.getId());
-		 //转map
-		 Field[] fields = entity.getClass().getDeclaredFields();
-		 for (Field field : fields) {
-			 field.setAccessible(true);
-			 map.put(field.getName(), field.get(entity));
-		 }
-
-		 //查询子表信息
-		 List<SyShippingOrderItem> itemList = syShippingOrderMapper.qeuryItemInfo(entity.getId());
-		 //集合转map
-		 for(SyShippingOrderItem li:itemList){
-			 Field[] fieldsList = li.getClass().getDeclaredFields();
-			 Map<String, Object> mapList = new HashMap<String, Object>();
-			 for (Field field : fieldsList) {
+		 try {
+			 //查询主表信息
+			 SyShippingOrder entity = syShippingOrderService.getById(syShippingOrder.getId());
+			 //转map
+			 Field[] fields = entity.getClass().getDeclaredFields();
+			 for (Field field : fields) {
 				 field.setAccessible(true);
-				 mapList.put(field.getName(), field.get(li));
+				 map.put(field.getName(), field.get(entity));
 			 }
-			 listmap.add(mapList);
-		 }
 
+			 //查询子表信息
+			 List<SyShippingOrderItem> itemList = syShippingOrderMapper.qeuryItemInfo(entity.getId());
+			 //集合转map
+			 for (SyShippingOrderItem li : itemList) {
+				 Field[] fieldsList = li.getClass().getDeclaredFields();
+				 Map<String, Object> mapList = new HashMap<String, Object>();
+				 for (Field field : fieldsList) {
+					 field.setAccessible(true);
+					 mapList.put(field.getName(), field.get(li));
+				 }
+				 listmap.add(mapList);
+			 }
 
-		 //查询人民币信息
-		 List<SyRmb> rmbList = syShippingOrderMapper.rmbList(entity.getId());
-		 //集合转map
-		 for(SyRmb li:rmbList){
-			 Field[] fieldsList = li.getClass().getDeclaredFields();
-			 Map<String, Object> mapList = new HashMap<String, Object>();
-			 for (Field field : fieldsList) {
-				 field.setAccessible(true);
-				 mapList.put(field.getName(), field.get(li));
+
+			 //查询人民币信息
+			 List<SyRmb> rmbList = syShippingOrderMapper.rmbList(entity.getId());
+			 //集合转map
+			 for (SyRmb li : rmbList) {
+				 Field[] fieldsList = li.getClass().getDeclaredFields();
+				 Map<String, Object> mapList = new HashMap<String, Object>();
+				 for (Field field : fieldsList) {
+					 field.setAccessible(true);
+					 mapList.put(field.getName(), field.get(li));
+				 }
+				 rmbmap.add(mapList);
 			 }
-			 rmbmap.add(mapList);
-		 }
 
-		 //查询美元信息
-		 List<SyUsd> usdList = syShippingOrderMapper.usdList(entity.getId());
-		 //集合转map
-		 for(SyUsd li:usdList){
-			 Field[] fieldsList = li.getClass().getDeclaredFields();
-			 Map<String, Object> mapList = new HashMap<String, Object>();
-			 for (Field field : fieldsList) {
-				 field.setAccessible(true);
-				 mapList.put(field.getName(), field.get(li));
+			 //查询美元信息
+			 List<SyUsd> usdList = syShippingOrderMapper.usdList(entity.getId());
+			 //集合转map
+			 for (SyUsd li : usdList) {
+				 Field[] fieldsList = li.getClass().getDeclaredFields();
+				 Map<String, Object> mapList = new HashMap<String, Object>();
+				 for (Field field : fieldsList) {
+					 field.setAccessible(true);
+					 mapList.put(field.getName(), field.get(li));
+				 }
+				 usdmap.add(mapList);
+			 }
+
+			 //查询装箱单子表，获取销售订单主表ID
+			 for (Map<String, Object> li : listmap) {
+				 //查面料
+				 SyPackingListFabricItem fabricEntity = syPackingListFabricItemService.getById(li.get("tailoringFabricItemId").toString());
+				 SyPackingListTailoringItem tailoringEntity = syPackingListTailoringItemService.getById(li.get("tailoringFabricItemId").toString());
+				 if (oConvertUtils.isNotEmpty(fabricEntity)) {
+					 //获取业务员编码、销售部门编码、客户简称
+					 li.put("orderId", fabricEntity.getSyOrderDataId());// = syShippingOrderMapper.querySOMain();
+				 } else if (oConvertUtils.isNotEmpty(tailoringEntity)) {
+					 li.put("orderId", fabricEntity.getSyOrderDataId());//  = syShippingOrderMapper.querySOMain(tailoringEntity.getSyOrderDataId());
+				 } else {
+					 result.setResult(0);
+					 result.setMessage("推送失败！请联系管理员");
+					 result.setSuccess(false);
+					 return result;
+				 }
+			 }
+
+			 int i = 0;
+			 if (itemList.get(0).getPkOrg().equals("901")) {
+				 i = syShippingOrderService.saveSalePayVouchOne(map, listmap, rmbmap, usdmap);
+			 } else if (itemList.get(0).getPkOrg().equals("902")) {
+				 i = syShippingOrderService.saveSalePayVouchThree(map, listmap, rmbmap, usdmap);
+			 } else if (itemList.get(0).getPkOrg().equals("903")) {
+				 i = syShippingOrderService.saveSalePayVouchThree(map, listmap, rmbmap, usdmap);
 			 }
-			 usdmap.add(mapList);
-		 }
 
-		 //查询装箱单子表，获取销售订单主表ID
-		 for(Map<String,Object> li:listmap) {
-			 //查面料
-			 SyPackingListFabricItem fabricEntity = syPackingListFabricItemService.getById(li.get("tailoringFabricItemId").toString());
-			 SyPackingListTailoringItem tailoringEntity = syPackingListTailoringItemService.getById(li.get("tailoringFabricItemId").toString());
-			 if (oConvertUtils.isNotEmpty(fabricEntity)) {
-				 //获取业务员编码、销售部门编码、客户简称
-				 li.put("orderId",fabricEntity.getSyOrderDataId());// = syShippingOrderMapper.querySOMain();
-			 } else if (oConvertUtils.isNotEmpty(tailoringEntity)) {
-				 li.put("orderId",fabricEntity.getSyOrderDataId());//  = syShippingOrderMapper.querySOMain(tailoringEntity.getSyOrderDataId());
+			 if (i > 0) {
+				 //修改同步状态
+				 entity.setSyStuta("1");
+				 syShippingOrderService.updateById(entity);
+				 result.setResult(1);
+				 result.setMessage("推送成功！");
+				 result.setSuccess(true);
 			 } else {
 				 result.setResult(0);
 				 result.setMessage("推送失败！请联系管理员");
 				 result.setSuccess(false);
-				 return result;
 			 }
-		 }
-
-		 int i = 0;
-		 if(itemList.get(0).getPkOrg().equals("901")){
-			 i = syShippingOrderService.saveSalePayVouchOne(map,listmap,rmbmap,usdmap);
-		  }else if(itemList.get(0).getPkOrg().equals("902")){
-			 i = syShippingOrderService.saveSalePayVouchThree(map,listmap,rmbmap,usdmap);
-		 }else if(itemList.get(0).getPkOrg().equals("903")){
-			 i = syShippingOrderService.saveSalePayVouchThree(map,listmap,rmbmap,usdmap);
-		 }
-
-         if(i>0){
-         	//修改同步状态
-			 entity.setSyStuta("1");
-			 syShippingOrderService.updateById(entity);
-         	result.setResult(1);
-         	result.setMessage("推送成功！");
-         	result.setSuccess(true);
-		 }else{
+		 }catch (Exception e){
+		 	e.printStackTrace();
 			 result.setResult(0);
 			 result.setMessage("推送失败！请联系管理员");
 			 result.setSuccess(false);
 		 }
-
 		 return result;
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -173,8 +173,8 @@ group by a.group_id) t group by t.elementsId,t.smailPo order by t.styleNumber,t.
     <!--    新增费用支出单子表-->
     <insert id="saveSalePayVouchs">
 
---   insert into SalePayVouch(cVouchID,cMaker,ID,cSPVCode,dDate,cDefine10,cCusCode,cDepCode,cPersonCode,Cexch_Name,iexchrate,cSOCode,cvencode,cnextsystem)
---      values('0000002979','应甜甜','1000001209','0000001132','2022-12-16 15:37:00','22TW-CAM-44','T020001','TSM03','T0149','人民币','1','SYW440-马菲羊-面料','0176','其他应付单')
+        <!--  insert into SalePayVouch(cVouchID,cMaker,ID,cSPVCode,dDate,cDefine10,cCusCode,cDepCode,cPersonCode,Cexch_Name,iexchrate,cSOCode,cvencode,cnextsystem)
+      values('0000002979','应甜甜','1000001209','0000001132','2022-12-16 15:37:00','22TW-CAM-44','T020001','TSM03','T0149','人民币','1','SYW440-马菲羊-面料','0176','其他应付单')-->
    insert into SalePayVouchs(cSPVCode,iMoney,cExpCode,ID,irowno)
    value (#{map.cSPVCode},#{map.iMoney},#{map.cExpCode},#{map.ID},#{map.irowno})
 
@@ -205,7 +205,7 @@ case when ready_fabric != '成衣' then sum(net_weight) else net_weight end as n
 case when ready_fabric != '成衣' then volume else volume end as volume,round(sum(total_price),2) as totalPrice,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purOrSubOrder, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
- memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, GROUP_CONCAT(tailoring_fabric_item_id) as tailoringFabricItemId,client_abbreviation as clientAbbreviation
+ memo, sort, ready_fabric as readyFabric, tailoring_fabric_id as tailoringFabricId, tailoring_fabric_item_id as tailoringFabricItemId,client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item where del_flag = 0 and sy_shipping_order_item_id = #{id}
 group by order_number
     </select>

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

@@ -582,7 +582,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 Map<String,Object> mapPo;
 
                 String orderId = li.get("orderId").toString();
-                mapPo = syShippingOrderMapper.querySOMain(orderId.substring(3,orderId.length()));//li.get("orderId").toString()
+                mapPo = syShippingOrderMapper.querySOMain(orderId);//li.get("orderId").toString()
 
                 if(ii>1){
                     cCode = org.jeecg.modules.system.util.oConvertUtils.addOne(cCode);