Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

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

@@ -185,31 +185,6 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     preEntity.setIsReference(1);
                     syPreAssembledPackingListService.updateById(preEntity);
                 }
-
-                //回写集装箱单号与集装箱代号
-                //预装箱单主表ID
-//                String perid = li.getSyPreAssembledPackingListId();
-//                String itemIdSplit[] = perid.split(",");
-//                for (String item:itemIdSplit) {
-//                    SyPreAssembledPackingList preEntity = new SyPreAssembledPackingList();
-//                    preEntity.setId(item);
-//                    //集装箱代号
-//                    preEntity.setContainerCode(li.getContainerCode());
-//                    //集装箱号
-//                    preEntity.setContainerNumber(li.getContainerNumber());
-//                    syPreAssembledPackingListService.updateById(preEntity);
-//
-//                    //回写发运明细是否被参照
-//                    SyPreAssembledPackingListItem preItem = syPreAssembledPackingListItemService.getById(li.getSyPreAssembledPackingListItemId());
-//                    if(oConvertUtils.isNotEmpty(preItem)){
-//                        //发运明细子表ID
-//                        String shippingIds = preItem.getSyDeclarationElementsItemId();
-//                        SyShippingDetailsItem syshippingItem = new SyShippingDetailsItem();
-//                        syshippingItem.setId(shippingIds);
-//                        syshippingItem.setIsReference(1);
-//                    }
-//                }
-
             }
             if(syLetterDepositItemList.size()!=0){
                 syLetterDepositItemService.saveBatch(syLetterDepositItemList);

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

@@ -410,11 +410,14 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 	  IPage<SyShippingDetailsVo> pageList = syShippingDetailsMapper.exCelQuery(page, queryWrapper);
 	  for(SyShippingDetailsVo li:pageList.getRecords()){
-	  	if(li.getIsTc().equals("0")){
-	  		li.setIsTc("否");
-		}else{
-			li.setIsTc("是");
+	  	if(oConvertUtils.isNotEmpty(li.getIsTc())){
+			if(li.getIsTc().equals("0")){
+				li.setIsTc("否");
+			}else{
+				li.setIsTc("是");
+			}
 		}
+
 	  }
 
 	  ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -100,7 +100,7 @@ public class MOMainController implements ApplicationContextAware {
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'headerAttributeDatetime1',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +
@@ -127,7 +127,7 @@ public class MOMainController implements ApplicationContextAware {
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'headerAttributeDatetime1',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,'' as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +
@@ -153,7 +153,7 @@ public class MOMainController implements ApplicationContextAware {
                             "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
                             "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'headerAttributeDatetime1',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -98,7 +98,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
-                            " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
+                            " mo.cmaketime  as 'headerAttributeDatetime1'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr1 " +
@@ -125,7 +125,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
-                            " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
+                            " mo.cmaketime  as 'headerAttributeDatetime1'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr1 " +
@@ -151,7 +151,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
                             "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
-                            " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
+                            " mo.cmaketime  as 'headerAttributeDatetime1'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr1 " +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -82,9 +82,9 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 String customerDemandDate = sf.format(map.get("customerDemandDate"));
                 jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
             }
-            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
-                String publishDate = sf.format(map.get("publishDate"));
-                jf.put("publishDate",publishDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("headerAttributeDatetime1"))){
+                String headerAttributeDatetime1 = sf.format(map.get("headerAttributeDatetime1"));
+                jf.put("headerAttributeDatetime1",headerAttributeDatetime1+" 00:00:00");
 
             }
 
@@ -212,9 +212,9 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 String customerDemandDate = sf.format(map.get("customerDemandDate"));
                 jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
             }
-            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
-                String publishDate = sf.format(map.get("publishDate"));
-                jf.put("publishDate",publishDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("headerAttributeDatetime1"))){
+                String headerAttributeDatetime1 = sf.format(map.get("headerAttributeDatetime1"));
+                jf.put("headerAttributeDatetime1",headerAttributeDatetime1+" 00:00:00");
 
             }
 //            String cAuditDate = sf.format(map.get("cAuditDate"));
@@ -332,9 +332,9 @@ public class JsonChangeUtils implements ApplicationContextAware{
                 String customerDemandDate = sf.format(map.get("customerDemandDate"));
                 jf.put("customerDemandDate",customerDemandDate+" 00:00:00");
             }
-            if(oConvertUtils.isNotEmpty(map.get("publishDate"))){
-                String publishDate = sf.format(map.get("publishDate"));
-                jf.put("publishDate",publishDate+" 00:00:00");
+            if(oConvertUtils.isNotEmpty(map.get("headerAttributeDatetime1"))){
+                String headerAttributeDatetime1 = sf.format(map.get("headerAttributeDatetime1"));
+                jf.put("headerAttributeDatetime1",headerAttributeDatetime1+" 00:00:00");
 
             }
             //查询子表信息