发运明细报关要素调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/seclarationElements/service/impl/SyDeclarationElementsServiceImpl.java

@@ -44,98 +44,102 @@ public class SyDeclarationElementsServiceImpl extends ServiceImpl<SyDeclarationE
     public SyDeclarationElements syDeclarationElementsAdd(SyDeclarationElements syDeclarationElements) {
         //子表集合
         List<SyDeclarationElementsItem> syDeclarationElementsItemList = new ArrayList<SyDeclarationElementsItem>();
-//        //用于修改新增的集合
-//        List<SyDeclarationElementsItem> syDeclarationElementsItemListUpdate = new ArrayList<SyDeclarationElementsItem>();
-
             //获取发运明细子表ID
             String ids = syDeclarationElements.getSyShippingids();
             String elementid = syDeclarationElements.getId();
-            List<String> shippingList = new ArrayList<>();
+
+              String id = oConvertUtils.id();
+//            //查询发运明细
+//            QueryWrapper<SyShippingDetailsItem> shiItemQuery = new QueryWrapper<>();
+//            shiItemQuery.in("id", shippingList);
+//            List<SyShippingDetailsItem> shList = syShippingDetailsItemService.list(shiItemQuery);
+//            //获取第一条数据
+//            SyShippingDetailsItem zero = shList.get(0);
+//
+//            if(oConvertUtils.isNotEmpty(elementid)){
+//                syDeclarationElements.setId(id);
+//            }
+//            syDeclarationElements.setInventoryCode(zero.getInventoryCode());
+//            syDeclarationElements.setAcSetNo(zero.getAccount());
+//            syDeclarationElements.setItemNumber(zero.getItemNumber());
+//            syDeclarationElements.setInventoryName(zero.getInventoryName());
+//
+//            List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
+//            for (SyDeclarationElementsItem item : list) {
+//                item.setId(oConvertUtils.id());
+//                item.setSyDeclarationElementsId(id);
+//                syDeclarationElementsItemList.add(item);
+//            }
+//            if (syDeclarationElementsItemList.size() != 0) {
+//                syDeclarationElementsItemService.saveBatch(syDeclarationElementsItemList);
+//            }
+//            //修改发运明细报关要素ID
+//            if(oConvertUtils.isNotEmpty(elementid)){
+//                syShippingDetailsService.updateElenmentId(id,elementid);
+//            }else{
+//                syShippingDetailsService.writeBackElenmentId(id,shippingList);
+//            }
+//
+//
+//            boolean ok = save(syDeclarationElements);
+//            if (ok) {
+//                return syDeclarationElements;
+//            }
+        if(oConvertUtils.isEmpty(elementid)){ //新增
+
+         List<String> shippingList = new ArrayList<>();
             String shSplit[] = ids.split(",");
             for (String s : shSplit) {
                 shippingList.add(s);
             }
-            String id = oConvertUtils.id();
-            //查询发运明细
-            QueryWrapper<SyShippingDetailsItem> shiItemQuery = new QueryWrapper<>();
-            shiItemQuery.in("id", shippingList);
-            List<SyShippingDetailsItem> shList = syShippingDetailsItemService.list(shiItemQuery);
-            //获取第一条数据
-            SyShippingDetailsItem zero = shList.get(0);
-
-            syDeclarationElements.setId(id);
-            syDeclarationElements.setInventoryCode(zero.getInventoryCode());
-            syDeclarationElements.setAcSetNo(zero.getAccount());
-            syDeclarationElements.setItemNumber(zero.getItemNumber());
-            syDeclarationElements.setInventoryName(zero.getInventoryName());
+                //设置ID
+                syDeclarationElements.setId(id);
+
+                List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
+                for (SyDeclarationElementsItem item:list){
+                    item.setId(oConvertUtils.id());
+                    item.setSyDeclarationElementsId(id);
+                    syDeclarationElementsItemList.add(item);
+                }
+                if(syDeclarationElementsItemList.size()!=0){
+                    syDeclarationElementsItemService.saveBatch(syDeclarationElementsItemList);
+                }
 
+                boolean ok = save(syDeclarationElements);
+                if(ok){
+                    return syDeclarationElements;
+               }
+
+               //回写发运明细报关要素ID
+               syShippingDetailsService.writeBackElenmentId(id,shippingList);
+
+        }else{ //修改
+
+             //删除子表
+            QueryWrapper<SyDeclarationElementsItem> queryWrapperItem = new QueryWrapper<SyDeclarationElementsItem>();
+            queryWrapperItem.eq("sy_declaration_elements_id", elementid).eq("del_flag", 0);
+            List<SyDeclarationElementsItem> syDeclarationElementsItemsList = syDeclarationElementsItemService.list(queryWrapperItem);
+
+            for(SyDeclarationElementsItem li:syDeclarationElementsItemsList){
+               // li.setDelFlag("1");
+                syDeclarationElementsItemService.removeById(li.getId());
+            }
+            //syDeclarationElementsItemService.updateBatchById(syDeclarationElementsItemsList);
+
+            //新增子表
             List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
-            for (SyDeclarationElementsItem item : list) {
+            for (SyDeclarationElementsItem item:list){
                 item.setId(oConvertUtils.id());
-                item.setSyDeclarationElementsId(id);
+                item.setSyDeclarationElementsId(syDeclarationElements.getId());
                 syDeclarationElementsItemList.add(item);
             }
-            if (syDeclarationElementsItemList.size() != 0) {
+            if(syDeclarationElementsItemList.size()!=0){
                 syDeclarationElementsItemService.saveBatch(syDeclarationElementsItemList);
             }
-            //修改发运明细报关要素ID
-            if(oConvertUtils.isNotEmpty(elementid)){
-                syShippingDetailsService.updateElenmentId(id,elementid);
-            }else{
-                syShippingDetailsService.writeBackElenmentId(id,shippingList);
-            }
-
-
-            boolean ok = save(syDeclarationElements);
-            if (ok) {
-                return syDeclarationElements;
-            }
 
-
-//        if(oConvertUtils.isEmpty(elemengid)){ //新增
-//
-//
-//
-//                //设置ID
-//                syDeclarationElements.setId(id);
-//
-//                List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
-//                for (SyDeclarationElementsItem item:list){
-//                    item.setId(oConvertUtils.id());
-//                    item.setSyDeclarationElementsId(id);
-//                    syDeclarationElementsItemList.add(item);
-//                }
-//                if(syDeclarationElementsItemList.size()!=0){
-//                    syDeclarationElementsItemService.saveBatch(syDeclarationElementsItemList);
-//                }
-//
-//                boolean ok = save(syDeclarationElements);
-//                if(ok){
-//                    return syDeclarationElements;
-//                }
-//
-//            }else{ //修改
-//
-//             //删除子表
-//            QueryWrapper<SyDeclarationElementsItem> queryWrapperItem = new QueryWrapper<SyDeclarationElementsItem>();
-//            queryWrapperItem.eq("sy_declaration_elements_id", ids).eq("del_flag", 0);
-//            List<SyDeclarationElementsItem> syDeclarationElementsItemsList = syDeclarationElementsItemService.list(queryWrapperItem);
-//            for(SyDeclarationElementsItem li:syDeclarationElementsItemsList){
-//                li.setDelFlag("1");
-//            }
-//            syDeclarationElementsItemService.updateBatchById(syDeclarationElementsItemsList);
-//
-//            //新增
-//            List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
-//            for (SyDeclarationElementsItem item:list){
-//                item.setId(oConvertUtils.id());
-//                item.setSyDeclarationElementsId(syDeclarationElements.getId());
-//                syDeclarationElementsItemListUpdate.add(item);
-//            }
-//            if(syDeclarationElementsItemListUpdate.size()!=0){
-//                syDeclarationElementsItemService.saveBatch(syDeclarationElementsItemListUpdate);
-//            }
-//        }
+            //修改主表
+            updateById(syDeclarationElements);
+        }
         return syDeclarationElements;
     }
 }

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

@@ -138,9 +138,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			queryWrapper.ge("t.preDeliveryDate",preDeliveryDateB);
 			queryWrapper.le("t.preDeliveryDate",preDeliveryDateE);
 		}
-		if(oConvertUtils.isNotEmpty(syShippingDetails.getPreDeliveryDate())){
-			queryWrapper.eq("t.preDeliveryDate",syShippingDetails.getPreDeliveryDate());
-		}
+
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getSalesman())){
 			queryWrapper.like("t.salesman",syShippingDetails.getSalesman());
 		}
@@ -743,10 +741,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   	Result<SyDeclarationElements> result = new Result<SyDeclarationElements>();
 
   	     //查询报关要素主表
-		 QueryWrapper<SyDeclarationElements> queryWrapper = new QueryWrapper<SyDeclarationElements>();
-  	     queryWrapper.eq("id",id);
-  	     List<SyDeclarationElements> syDeclarationElements = syDeclarationElementsService.list(queryWrapper);
-		 if(syDeclarationElements.size()==0){
+		 SyDeclarationElements entity = syDeclarationElementsService.getById(id);
+		 if(oConvertUtils.isEmpty(entity)){
 		 	 //查询发运明细获取款号，物料，账套
 			 String str[] = syShippingids.split(",");
 			 QueryWrapper<SyShippingDetailsItem> shiItemQuery = new QueryWrapper<>();
@@ -758,8 +754,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 syDeclarationElementsEntityNull.setAcSetNo(zero.getAccount());
 			 syDeclarationElementsEntityNull.setItemNumber(zero.getItemNumber());
 			 syDeclarationElementsEntityNull.setInventoryName(zero.getInventoryName());
-//			 syDeclarationElementsEntityNull.setEnglishProductName(entity.getEnglishProductName());
-//			 syDeclarationElementsEntityNull.setDeclarationName(entity.getDeclarationName());
 
 			 List<SyDeclarationElementsItem> entityList = new ArrayList<>();
 			 syDeclarationElementsEntityNull.setSyDeclarationElementsItemList(entityList);
@@ -767,16 +761,15 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 result.setSuccess(true);
 			 result.setResult(syDeclarationElementsEntityNull);
 		 }else {
-			 SyDeclarationElements syDeclarationElementsEntity = syDeclarationElements.get(0);
 			 //查询报关要素子表
 			 QueryWrapper<SyDeclarationElementsItem> queryWrapperItem = new QueryWrapper<SyDeclarationElementsItem>();
-			 queryWrapperItem.eq("sy_declaration_elements_id", syDeclarationElementsEntity.getId()).eq("del_flag", 0);
+			 queryWrapperItem.eq("sy_declaration_elements_id", id).eq("del_flag", 0);
 			 List<SyDeclarationElementsItem> syDeclarationElementsItemsList = syDeclarationElementsItemService.list(queryWrapperItem);
-			 syDeclarationElementsEntity.setSyDeclarationElementsItemList(syDeclarationElementsItemsList);
+			 entity.setSyDeclarationElementsItemList(syDeclarationElementsItemsList);
 
 			 result.setMessage("查询成功！");
 			 result.setSuccess(true);
-			 result.setResult(syDeclarationElementsEntity);
+			 result.setResult(entity);
 		 }
 
   	     return result;

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

@@ -9,7 +9,7 @@
            a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,sum(b.surplus_num) as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
            b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,guangpei_gate_width as guangpeiGateWidth,
-           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
+           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,b.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
@@ -34,7 +34,7 @@
            a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,sum(b.surplus_num) as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
            b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,guangpei_gate_width as guangpeiGateWidth,
-           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
+           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,b.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -232,4 +232,12 @@ public class SyShippingOrder {
 	@ApiModelProperty(value = "提交或者取消提交")
 	@TableField(exist = false)
 	private String type;
+
+	//运输方式
+	private String typeOfShipping;
+
+	//海关代码
+	private String customsCode;
+	//税号
+	private String dutyParagraph;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrderItem.java

@@ -199,4 +199,6 @@ public class SyShippingOrderItem {
 	@Excel(name = "成衣工厂", width = 15)
 	@ApiModelProperty(value = "成衣工厂")
 	private String garmentFactory;
+
+
 }