托书调整

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

@@ -712,32 +712,16 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 					 //查询数据字典-公司抬头
 					 List<DictModel> test = sysDictService.queryDictItemsByCode("company_title");
-					 if (oConvertUtils.isNotEmpty(list.get(0).getPkOrg())) {
-						 if (list.get(0).getPkOrg().equals("101")) {
-							 String split[] = test.get(0).getValue().split("\\+");
-							 for (int i = 0; i < split.length; i++) {
-								 Map<String, Object> maiTou = new HashMap<>();
-								 maiTou.put("name", split[i]);
-								 taitouList.add(maiTou);
-							 }
-							 entity.setClientAbbreviation(split[0]);
-						 } else if (list.get(0).getPkOrg().equals("102")) {
-							 String split[] = test.get(1).getValue().split("\\+");
-							 for (int i = 0; i < split.length; i++) {
-								 Map<String, Object> maiTou = new HashMap<>();
-								 maiTou.put("name", split[i]);
-								 taitouList.add(maiTou);
-							 }
-							 entity.setClientAbbreviation(split[0]);
-						 }
-						 if (list.get(0).getPkOrg().equals("103")) {
-							 String split[] = test.get(1).getValue().split("\\+");
-							 for (int i = 0; i < split.length; i++) {
-								 Map<String, Object> maiTou = new HashMap<>();
-								 maiTou.put("name", split[i]);
-								 taitouList.add(maiTou);
+					 if (test.size()!=0) {
+						 for (DictModel te : test) {
+							 if (list.get(0).getPkOrg().equals(te.getText())) {
+								 String split[] = test.get(0).getValue().split("\\+");
+								 for (int i = 0; i < split.length; i++) {
+									 Map<String, Object> maiTou = new HashMap<>();
+									 maiTou.put("name", split[i + 1]);
+									 taitouList.add(maiTou);
+								 }
 							 }
-							 entity.setClientAbbreviation(split[0]);
 						 }
 					 }
 					 //转map
@@ -767,6 +751,21 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 				 } else {
 
+					 //获取公司抬头信息
+					 List<DictModel> companyTitle = sysDictService.queryDictItemsByCode("company_title");
+					 if (companyTitle.size()!=0) {
+						 for(DictModel di:companyTitle){
+							 if (list.get(0).getPkOrg().equals(di.getText())) {
+								 String split[] = di.getValue().split("\\+");
+
+								 entity.setCorporationName(split[0]);
+								 entity.setCorporationEngLish(split[1]);
+								 entity.setCorporationAddress(split[2]);
+								 entity.setCorporationTel(split[3]);
+							 }
+						 }
+
+					 }
 					 if(entity.getReadyFabric().equals("成衣")){
 						 //获取模板输入流
 						 InputStream inStream = new FileInputStream("D:\\单证模板\\托书成衣合并Excel.xlsx");
@@ -914,6 +913,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 					 }else{//面辅料数据
 
+
 						 //获取模板输入流
 						 InputStream inStream = new FileInputStream("D:\\单证模板\\托书面辅料合并Excel.xlsx");
 						 //通过poi创建表对象

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

@@ -318,4 +318,16 @@ public class SyShippingOrder {
 	//最早交期
 	@TableField(exist = false)
 	private String earliestDeliveryDate;
+	//经营单位中文名称
+	@TableField(exist = false)
+	private String corporationName;
+	//经营单位英文名称
+	@TableField(exist = false)
+	private String corporationEngLish;
+	//经营单位地址
+	@TableField(exist = false)
+	private String corporationAddress;
+	//经营单位电话
+	@TableField(exist = false)
+	private String corporationTel;
 }

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

@@ -109,7 +109,7 @@ case when a.ready_fabric != '成衣' then sum(a.net_weight) else a.net_weight en
 case when a.ready_fabric != '成衣' then a.volume else a.volume end as volume,round(sum(a.total_price),2) as totalPrice,
 a.distribution_point as distributionPoint, a.container_code as containerCode, a.container_number as containerNumber, a.unit_price as unitPrice, a.pre_shipment_date as preShipmentDate,
 a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcing_order_no as purOrSubOrder, a.outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,
- a.memo, a.sort, a.ready_fabric as readyFabric, GROUP_CONCAT(a.tailoring_fabric_id) as tailoringFabricId, GROUP_CONCAT(a.tailoring_fabric_item_id) as tailoringFabricItemId,a.client_abbreviation as clientAbbreviation
+ a.memo, a.sort, a.ready_fabric as readyFabric, GROUP_CONCAT(DISTINCT a.tailoring_fabric_id) as tailoringFabricId, GROUP_CONCAT(a.tailoring_fabric_item_id) as tailoringFabricItemId,a.client_abbreviation as clientAbbreviation
  FROM sy_shipping_order_item a
         <if test='type == "成衣"'>
             left join sy_packing_list_tailoring_item c
@@ -129,7 +129,7 @@ group by a.group_id order by style_number,smail_po desc
     <select id="queryEelementMerge" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 
 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,case when ready_fabric != '辅料' then sum(c.meter) else sum(c.actual_declared_quantity) end as meter,sum(a.number) as number,a.unit_price as unitPrice,
-round(sum(a.total_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,'KG' as pcs,a.volume as volume,
+round(sum(a.total_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,'KG' as pcs,a.volume as volume,a.pk_org as pkOrg,
 'USD' as curr,'CHINA' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,sum(a.box_number) as boxNumber,
 a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.factory_Unit_Price as factoryUnitPrice,
 b.declaration_unit as declarationUnit

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

@@ -303,16 +303,26 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     }
 
                     //回写装箱成衣外销发票号、是否被参照、托书号,集装箱号，集装箱代号
-                    SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
-                    if(oConvertUtils.isEmpty(syPackingListTailoring)){
+                    List<String> tailoringFabricIdList = new ArrayList<>();
+                    String tTailoringFabricIdSplit[] = li.getTailoringFabricId().split(",");
+                    for(String ste:tTailoringFabricIdSplit){
+                        tailoringFabricIdList.add(ste);
+                    }
+                    QueryWrapper<SyPackingListTailoring> queryWrapper2 = new QueryWrapper<>();
+                    queryWrapper2.in("id",tailoringFabricIdList);
+                    List<SyPackingListTailoring> syPackingListFabric = syPackingListTailoringService.list(queryWrapper2);
+                   // SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
+                    if(syPackingListFabric.size()==0){
                         throw new JeecgBootException("没有查询到装箱单数据！");
                     }
-                    syPackingListTailoring.setExportInvoiceNo(syShippingOrder.getShippingOrderNumber());
-                    syPackingListTailoring.setIsReference(1);
-                    syPackingListTailoring.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
-                    //syPackingListTailoring.setContainerCode(li.getContainerCode());
-                    syPackingListTailoring.setContainerNumber(li.getContainerNumber());
-                    syPackingListTailoringService.updateById(syPackingListTailoring);
+                    for(SyPackingListTailoring s:syPackingListFabric){
+                        s.setExportInvoiceNo(syShippingOrder.getShippingOrderNumber());
+                        s.setIsReference(1);
+                        s.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
+                        //syPackingListTailoring.setContainerCode(li.getContainerCode());
+                        s.setContainerNumber(li.getContainerNumber());
+                        syPackingListTailoringService.updateById(s);
+                    }
 
                 }
 
@@ -407,17 +417,32 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
 
             }else{//成衣
-                //回写预装箱-成衣是否被参照，托书号
-                SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
-                if(oConvertUtils.isEmpty(syPackingListTailoring)){
+
+                //查询预装箱但成衣数据
+                List<String> tailoringFabricIdList = new ArrayList<>();
+                String taID[]=li.getTailoringFabricId().split(",");
+                for(String s:taID){
+                    tailoringFabricIdList.add(s);
+                }
+                QueryWrapper<SyPackingListTailoring> queryWrapper = new QueryWrapper<>();
+                queryWrapper.in("id",tailoringFabricIdList);
+                List<SyPackingListTailoring> syPackingListFabric = syPackingListTailoringService.list(queryWrapper);
+                if(syPackingListFabric.size()==0){
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
-                syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber("");
-                syPackingListTailoring.setExportInvoiceNo("");
-                //syPackingListTailoring.setContainerCode("");
-                syPackingListTailoring.setContainerNumber("");
-                syPackingListTailoringService.updateById(syPackingListTailoring);
+                //回写预装箱-成衣是否被参照，托书号
+                for(SyPackingListTailoring str:syPackingListFabric) {
+                    str.setIsReference(0);
+                    str.setShippingOrderNumber("");
+                    str.setExportInvoiceNo("");
+                    //syPackingListTailoring.setContainerCode("");
+                    str.setContainerNumber("");
+                    syPackingListTailoringService.updateById(str);
+                }
+//                SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
+//                if(oConvertUtils.isEmpty(syPackingListTailoring)){
+//                    throw new JeecgBootException("没有查询到装箱单成衣数据！");
+//                }
             }
             //删除子表
             syShippingOrderItemService.removeById(li.getId());
@@ -477,7 +502,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         queryWrapper.eq("sy_shipping_order_item_id",id).eq("del_flag","0");
         List<SyShippingOrderItem> list = syShippingOrderItemService.list(queryWrapper);
         if(list.size() == 0){
-            throw new JeecgBootException("没有查询到装箱单面料数据！");
+            throw new JeecgBootException("没有查询到数据！");
         }
 
         for(SyShippingOrderItem li:list){
@@ -498,16 +523,27 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
             }else{//成衣
                 //回写预装箱-成衣是否被参照，托书号
-                SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
-                if(oConvertUtils.isEmpty(syPackingListTailoring)){
+                //查询预装箱但成衣数据
+                List<String> tailoringFabricIdList = new ArrayList<>();
+                String taID[]=li.getTailoringFabricId().split(",");
+                for(String s:taID){
+                    tailoringFabricIdList.add(s);
+                }
+                QueryWrapper<SyPackingListTailoring> queryWrapper1 = new QueryWrapper<>();
+                queryWrapper1.in("id",tailoringFabricIdList);
+                List<SyPackingListTailoring> syPackingListFabric = syPackingListTailoringService.list(queryWrapper1);
+                if(syPackingListFabric.size()==0){
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
-                syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber("");
-                syPackingListTailoring.setExportInvoiceNo("");
-                //syPackingListTailoring.setContainerCode("");
-                syPackingListTailoring.setContainerNumber("");
-                syPackingListTailoringService.updateById(syPackingListTailoring);
+                //回写预装箱-成衣是否被参照，托书号
+                for(SyPackingListTailoring str:syPackingListFabric) {
+                    str.setIsReference(0);
+                    str.setShippingOrderNumber("");
+                    str.setExportInvoiceNo("");
+                    //str.setContainerCode("");
+                    str.setContainerNumber("");
+                    syPackingListTailoringService.updateById(str);
+                }
             }
         }