文档问题调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -58,7 +58,7 @@ on a.id = b.sy_pre_assembled_packing_list_id
     </update>
 
     <update id="syUsdDelete">
-        update sy_rmb
+        update sy_usd
         set del_flag = '1'
         where sy_letter_deposit_id = #{syLetterDepositId}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/ISyLetterDepositService.java

@@ -45,5 +45,8 @@ public interface ISyLetterDepositService extends IService<SyLetterDeposit> {
     //合并参照预装箱单数据
     IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 
-
+    //新增人民币
+    public void syRmbAdd(List<SyRmb> rmbList);
+    //新增美元
+    public void syUsdAdd(List<SyUsd> usdList);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -368,4 +368,14 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
     public IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper) {
         return syLetterDepositMapper.mergeSyPreAssembledPackingList(page, queryWrapper);
     }
+
+    @Override
+    public void syRmbAdd(List<SyRmb> rmbList) {
+        syLetterDepositMapper.syRmbAdd(rmbList);
+    }
+
+    @Override
+    public void syUsdAdd(List<SyUsd> usdList) {
+        syLetterDepositMapper.syUsdAdd(usdList);
+    }
 }

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

@@ -22,6 +22,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyRmb;
 import org.jeecg.modules.documents.letterDeposit.entity.SyUsd;
 import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositMapper;
+import org.jeecg.modules.documents.letterDeposit.service.impl.SyLetterDepositServiceImpl;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
 import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElementsItem;
 import org.jeecg.modules.documents.seclarationElements.service.impl.SyDeclarationElementsItemServiceImpl;
@@ -45,6 +46,7 @@ import org.jeecg.modules.system.service.impl.SysDictServiceImpl;
 import org.jeecgframework.poi.excel.ExcelExportUtil;
 import org.jeecgframework.poi.excel.entity.TemplateExportParams;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
@@ -73,6 +75,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 private SyShippingOrderMapper syShippingOrderMapper;
 	 @Autowired
 	 private SysDictServiceImpl sysDictService;
+	 @Autowired
+	 private SyLetterDepositServiceImpl syLetterDepositService;
 	 @Resource
 	 private SyLetterDepositMapper syLetterDepositMapper;
 
@@ -545,7 +549,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 public Result<SyShippingOrder> syShippingOrderPrint(String id,String testName,HttpServletResponse response)  throws ParseException {
 
 		 Result<SyShippingOrder> result= new Result<SyShippingOrder>();
-
+         String readyFabric = "";
 		 //子表集合
 		 List<SyShippingOrderItem> list = new ArrayList<>();
 		 //总毛重
@@ -579,6 +583,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 			 // 只要不是成品，需要做汇总操作，汇总条件为报关品名+HSCODE
 			 if(entity.getReadyFabric().equals("成衣")){
+				 readyFabric = "申报要素-成衣";
 				 list = syShippingOrderMapper.queryEelement(id);
 				 for(SyShippingOrderItem li:list){
 					 totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());
@@ -589,6 +594,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 li.setDestination(entity.getArriveInCountry());
 				 }
 			 }else{
+				 readyFabric = "申报要素-面辅料";
 				 list = syShippingOrderMapper.queryEelementMerge(id);
 				 for(SyShippingOrderItem li:list){
 					 totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());
@@ -674,7 +680,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 workbook.write(outputStream);
 
 			 }
-			 else if(testName.equals("报关信息-申报要素-成衣")){
+			 else if(testName.equals("报关信息-申报要素")){
 
 				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
 
@@ -683,8 +689,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 List<SyShippingOrderItem> itemList = syShippingOrderItemService.list(queryWrapper);
 
 				 int i = 1;
-				for(SyShippingOrderItem li:itemList){
-					map.put("name","没用"+li.getReadyFabric());
+				for(SyShippingOrderItem li:itemList) {
+					map.put("name", "没用" + li.getReadyFabric());
 
 					Map<String, Object> map1 = new HashMap<String, Object>();
 					Map<String, Object> map3 = new HashMap<String, Object>();
@@ -692,115 +698,55 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					Map<String, Object> map5 = new HashMap<String, Object>();
 
 					//查询主表
-				    SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
-				    //查询子表
+					SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
+					//查询子表
 					QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
-					itemQueryWrapper.eq("sy_declaration_elements_id",li.getElementsId()).eq("del_flag",0);
-                    List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
-                    if(itemList1.size()==0){
-                    	result.setSuccess(false);
-                    	result.setMessage("报关要素未维护！");
-                    	return result;
-					}
-					map1.put("name",i+"、商品编码:");
-					map1.put("value",elementEntity.getInventoryCode());
-					listMap.add(map1);
-
-					map3.put("name","商品描述:");
-					map3.put("value","");
-					listMap.add(map3);
-
-					map4.put("name","申报要素:");
-					map4.put("value","");
-					listMap.add(map4);
-
-					int m = 1;
-					for(SyDeclarationElementsItem li1:itemList1){
-						Map<String, Object> map2 = new HashMap<String, Object>();
-						if(li1.getTypeValue().equals("品名")){
-							li1.setDescribeText(elementEntity.getDeclarationName());
+					itemQueryWrapper.eq("sy_declaration_elements_id", li.getElementsId()).eq("del_flag", 0);
+					List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
+					if (itemList1.size() == 0) {
+						map1.put("name", i + "、商品编码:");
+						map1.put("value", "");
+						listMap.add(map1);
+
+						map3.put("name", "商品描述:");
+						map3.put("value", "");
+						listMap.add(map3);
+
+						map4.put("name", "申报要素:");
+						map4.put("value", "");
+						listMap.add(map4);
+					} else {
+						map1.put("name", i + "、商品编码:");
+						map1.put("value", elementEntity.getInventoryCode());
+						listMap.add(map1);
+
+						map3.put("name", "商品描述:");
+						map3.put("value", "");
+						listMap.add(map3);
+
+						map4.put("name", "申报要素:");
+						map4.put("value", "");
+						listMap.add(map4);
+
+						int m = 1;
+						for (SyDeclarationElementsItem li1 : itemList1) {
+							Map<String, Object> map2 = new HashMap<String, Object>();
+							if (li1.getTypeValue().equals("品名")) {
+								li1.setDescribeText(elementEntity.getDeclarationName());
+							}
+							map2.put("name", m + "、" + li1.getTypeValue() + ":");
+							map2.put("value", li1.getDescribeText());
+							listMap.add(map2);
+							m++;
 						}
-						map2.put("name", m+"、"+li1.getTypeValue()+":");
-						map2.put("value",li1.getDescribeText());
-						listMap.add(map2);
-						m++;
-					}
-					i++;
+						i++;
 
-					map5.put("name","");
-					map5.put("value","");
-					listMap.add(map5);
+						map5.put("name", "");
+						map5.put("value", "");
+						listMap.add(map5);
+					}
 				}
-				 map.put("list", listMap);
-
-				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
-				 ServletOutputStream outputStream = response.getOutputStream();
-				 workbook.write(outputStream);
-
-			 } else if(testName.equals("报关信息-申报要素-面料")){
-
-				 List<Map<String, Object>> listMap1 = new ArrayList<Map<String, Object>>();
-
-				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
-
-				 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);
-
-				 int i = 1;
-				 for(SyShippingOrderItem li:itemList){
-					 map.put("name","没用"+li.getReadyFabric());
-
-					 Map<String, Object> map1 = new HashMap<String, Object>();
-					 Map<String, Object> map3 = new HashMap<String, Object>();
-					 Map<String, Object> map4 = new HashMap<String, Object>();
-					 Map<String, Object> map5 = new HashMap<String, Object>();
-
-					 //查询主表
-					 SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
-					 //查询子表
-					 QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
-					 itemQueryWrapper.eq("sy_declaration_elements_id",li.getElementsId()).eq("del_flag",0);
-					 List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
-
-					 map1.put("name",i+"、商品税号:");
-					 map1.put("value",elementEntity.getHsCode());
-					 map1.put("text","");
-					 listMap.add(map1);
-
-					 map3.put("name","商品名称:");
-					 map3.put("value",elementEntity.getInventoryName());
-					 map3.put("text","");
-					 listMap.add(map3);
-
-					 map4.put("name","申报要素项数");
-					 map4.put("value","申报要素内容");
-					 map4.put("text","");
-					 listMap.add(map4);
-
-					 int m = 0;
-					 for(SyDeclarationElementsItem li1:itemList1){
-						 Map<String, Object> map2 = new HashMap<String, Object>();
-						 if(li1.getTypeValue().equals("品名")){
-							 li1.setDescribeText(elementEntity.getDeclarationName());
-							 map2.put("name","");
-							 map2.put("value",li1.getTypeValue());
-							 map2.put("text",li1.getDescribeText());
-							 listMap.add(map2);
-						 }else {
-							 map2.put("name", m);
-							 map2.put("value", li1.getTypeValue());
-							 map2.put("text", li1.getDescribeText());
-							 listMap.add(map2);
-							 m++;
-						 }
-					 }
-					 i++;
-
-					 map5.put("name","");
-					 map5.put("value","");
-					 listMap.add(map5);
-				 }
+				 map.put("readyFabric",readyFabric);
 				 map.put("list", listMap);
 
 				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
@@ -808,6 +754,77 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 				 workbook.write(outputStream);
 
 			 }
+//			 else if(testName.equals("报关信息-申报要素-面料")){
+//
+//				 List<Map<String, Object>> listMap1 = new ArrayList<Map<String, Object>>();
+//
+//				 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\"+testName+".xlsx");
+//
+//				 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);
+//
+//				 int i = 1;
+//				 for(SyShippingOrderItem li:itemList){
+//					 map.put("name","没用"+li.getReadyFabric());
+//
+//					 Map<String, Object> map1 = new HashMap<String, Object>();
+//					 Map<String, Object> map3 = new HashMap<String, Object>();
+//					 Map<String, Object> map4 = new HashMap<String, Object>();
+//					 Map<String, Object> map5 = new HashMap<String, Object>();
+//
+//					 //查询主表
+//					 SyDeclarationElements elementEntity = syDeclarationElementsService.getById(li.getElementsId());
+//					 //查询子表
+//					 QueryWrapper<SyDeclarationElementsItem> itemQueryWrapper = new QueryWrapper<>();
+//					 itemQueryWrapper.eq("sy_declaration_elements_id",li.getElementsId()).eq("del_flag",0);
+//					 List<SyDeclarationElementsItem> itemList1 = syDeclarationElementsItemService.list(itemQueryWrapper);
+//
+//					 map1.put("name",i+"、商品税号:");
+//					 map1.put("value",elementEntity.getHsCode());
+//					 map1.put("text","");
+//					 listMap.add(map1);
+//
+//					 map3.put("name","商品名称:");
+//					 map3.put("value",elementEntity.getInventoryName());
+//					 map3.put("text","");
+//					 listMap.add(map3);
+//
+//					 map4.put("name","申报要素项数");
+//					 map4.put("value","申报要素内容");
+//					 map4.put("text","");
+//					 listMap.add(map4);
+//
+//					 int m = 0;
+//					 for(SyDeclarationElementsItem li1:itemList1){
+//						 Map<String, Object> map2 = new HashMap<String, Object>();
+//						 if(li1.getTypeValue().equals("品名")){
+//							 li1.setDescribeText(elementEntity.getDeclarationName());
+//							 map2.put("name","");
+//							 map2.put("value",li1.getTypeValue());
+//							 map2.put("text",li1.getDescribeText());
+//							 listMap.add(map2);
+//						 }else {
+//							 map2.put("name", m);
+//							 map2.put("value", li1.getTypeValue());
+//							 map2.put("text", li1.getDescribeText());
+//							 listMap.add(map2);
+//							 m++;
+//						 }
+//					 }
+//					 i++;
+//
+//					 map5.put("name","");
+//					 map5.put("value","");
+//					 listMap.add(map5);
+//				 }
+//				 map.put("list", listMap);
+//
+//				 Workbook workbook = ExcelExportUtil.exportExcel(params,map);
+//				 ServletOutputStream outputStream = response.getOutputStream();
+//				 workbook.write(outputStream);
+//
+//			 }
 			 else if(testName.equals("报关信息-发票")){
 
 				 //重新赋值
@@ -1049,40 +1066,40 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	  * @return
 	  */
 	 @PostMapping(value = "/updateUSD_RMB")
+	 @Transactional
 	 public Result<SyShippingOrder> updateUSD_RMB(@RequestBody SyShippingOrder syShippingOrder){
 
 		 Result<SyShippingOrder> result = new Result<SyShippingOrder>();
+		 List<SyRmb> rmbList = new ArrayList<>();
+		 List<SyUsd> usdList = new ArrayList<>();
 
-		 //人民币
-		 if(syShippingOrder.getRmbList().size()==0){
-			 //删除人民币信息
-			 syLetterDepositMapper.syRmbDelete(syShippingOrder.getId());
-		 }else{
-		 	 //先删除再新增
+		 try {
+
+			 //先删除再新增
 			 syLetterDepositMapper.syRmbDelete(syShippingOrder.getId());
-			 for(SyRmb li:syShippingOrder.getRmbList()){
+			 syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
+
+
+			 for (SyRmb li : syShippingOrder.getRmbList()) {
 				 li.setId(oConvertUtils.id());
 				 li.setSyLetterDepositId(syShippingOrder.getId());
 				 li.setDelFlag("0");
+				 rmbList.add(li);
 			 }
-			 syLetterDepositMapper.syRmbAdd(syShippingOrder.getRmbList());
+			 syLetterDepositService.syRmbAdd(rmbList);
 
-		 }
-		 //美元
-		 if(syShippingOrder.getUsdList().size()==0){
-			 //删除美元信息
-			 syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
-		 }else{
-			 //先删除再新增
-			 syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
-			 for(SyUsd li:syShippingOrder.getUsdList()){
+
+			 for (SyUsd li : syShippingOrder.getUsdList()) {
 				 li.setId(oConvertUtils.id());
 				 li.setSyLetterDepositId(syShippingOrder.getId());
 				 li.setDelFlag("0");
+				 usdList.add(li);
 			 }
-			 syLetterDepositMapper.syUsdAdd(syShippingOrder.getUsdList());
-		 }
+			 syLetterDepositService.syUsdAdd(usdList);
 
+		 }catch (Exception e){
+		 	e.printStackTrace();
+		 }
 		 result.setMessage("修改成功！");
 		 result.setSuccess(true);
 		 result.setResult(syShippingOrder);

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

@@ -149,6 +149,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     fabricItemIdList.add(str);
                 }
 
+                totalVolume = totalVolume.add(li.getVolume());//总体积
+                totalGrossWeight = totalGrossWeight.add(li.getGrossWeight());//总毛重
                 if(li.getReadyFabric().equals("面料")){
                     //查询装箱单面料子表数据
                     QueryWrapper<SyPackingListFabricItem> queryWrapper = new QueryWrapper<SyPackingListFabricItem>();
@@ -185,10 +187,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setTailoringFabricItemId(itemli.getId());//成衣或者面料子表ID
                         syShippingOrderItem.setSmailPo(itemli.getSmallPo());
                         syShippingOrderItem.setGrossWeight(itemli.getGrossWeight());
-                        totalGrossWeight = totalGrossWeight.add(itemli.getGrossWeight());
+
                         syShippingOrderItem.setNetWeight(itemli.getNetWeight());
                         syShippingOrderItem.setVolume(syShippingOrder.getTotalVolume());//体积
-                        totalVolume = syShippingOrder.getTatolVolume();
+
                         syShippingOrderItem.setDistributionPoint(itemli.getDistributionPoint());
                         //报关单价 = 总金额/净重
                         BigDecimal price = itemli.getTotalPrice().divide(itemli.getNetWeight(),4,BigDecimal.ROUND_DOWN);
@@ -252,10 +254,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setSmailPo(lit.getSmallPo());
                         syShippingOrderItem.setGrossWeight(lit.getTotalGrossWeight());//毛重
-                        totalGrossWeight = totalGrossWeight.add(lit.getTotalGrossWeight());
+
                         syShippingOrderItem.setNetWeight(lit.getTotalNetWeight());//净重
                         syShippingOrderItem.setVolume(lit.getTotalVolume());//体积
-                        totalVolume = totalVolume.add(lit.getTotalVolume());
+
                         syShippingOrderItem.setDistributionPoint(lit.getDistributionPoint());
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());
                         syShippingOrderItem.setPreShipmentDate(lit.getHod());
@@ -296,6 +298,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                 }
 
+                //清空集合
+                fabricItemIdList.clear();
             }
             //总毛重
             syShippingOrder.setTotalGrossWeight(totalGrossWeight);