BUG调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -244,7 +244,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		Result<SyLetterDeposit> result = new Result<SyLetterDeposit>();
 
 		//预装箱单ID集合
-		List<String> assembledList = new ArrayList<>();
+		//List<String> assembledList = new ArrayList<>();
 
 		try {
 			if(syLetterDeposit.getSyLetterDepositItemList().size()==0){
@@ -266,21 +266,21 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 
 			//判断预装箱单下游有没有装箱单数据
 			//查询装箱单子表数据
-			String assIds = list.get(0).getPreIds();
-			String assSplit[] = assIds.split(",");
-			for(String str:assSplit){
-				assembledList.add(str);
-			}
-			//查询是否游下游装箱单sy_packing_list_tailoring_item
-			QueryWrapper<SyPackingListTailoringItem> queryWrapper1 = new QueryWrapper<>();
-			queryWrapper1.in("sy_Pre_Assembled_Packing_List_Item_Id",assembledList).eq("del_flag",0);
-			List<SyPackingListTailoringItem> itemList = syPackingListTailoringItemService.list(queryWrapper1);
-			if(itemList.size() !=0 ){
-				result.setSuccess(false);
-				result.setMessage("该单据参照的预装箱单下游装箱单有单据，无法修改");
-				return result;
-
-			}
+//			String assIds = list.get(0).getPreIds();
+//			String assSplit[] = assIds.split(",");
+//			for(String str:assSplit){
+//				assembledList.add(str);
+//			}
+//			//查询是否游下游装箱单sy_packing_list_tailoring_item
+//			QueryWrapper<SyPackingListTailoringItem> queryWrapper1 = new QueryWrapper<>();
+//			queryWrapper1.in("sy_Pre_Assembled_Packing_List_Item_Id",assembledList).eq("del_flag",0);
+//			List<SyPackingListTailoringItem> itemList = syPackingListTailoringItemService.list(queryWrapper1);
+//			if(itemList.size() !=0 ){
+//				result.setSuccess(false);
+//				result.setMessage("该单据参照的预装箱单下游装箱单有单据，无法修改");
+//				return result;
+//
+//			}
 
 			//查询之前的数据
 			SyLetterDeposit t = syLetterDepositService.getById(syLetterDeposit.getId());

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

@@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyRmb;
@@ -131,7 +132,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			queryWrapper.eq("b.smail_po",smailPo);
 		}
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getShippingOrderNumber())){
-			queryWrapper.eq("a.shipping_order_number",syShippingOrder.getShippingOrderNumber());
+			queryWrapper.like("a.shipping_order_number",syShippingOrder.getShippingOrderNumber().trim());
 		}
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getExportInvoiceNo())){
 			queryWrapper.eq("a.export_invoice_no",syShippingOrder.getExportInvoiceNo());
@@ -571,7 +572,15 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //					 }
 //				 }
 //			 }
+			 QueryWrapper<SyShippingOrder> queryWrapper = new QueryWrapper<SyShippingOrder>();
+			 queryWrapper.in("id",syShippingOrder.getIds());
+			 List<SyShippingOrder> entityList = syShippingOrderService.list(queryWrapper);
 
+			 for(SyShippingOrder li:entityList){
+				 if(oConvertUtils.isEmpty(li.getLatestDateOfShipment()) || oConvertUtils.isEmpty(li.getTheFinalShippingDate())){
+					 throw new JeecgBootException("装运日期或最终船期不能为空，提交失败！");
+				 }
+			 }
 			 int i = syShippingOrderService.syShippingOrderSubmit(syShippingOrder.getIds(),syShippingOrder.getType());
 			 if(i>0){
 				 if(syShippingOrder.getType().equals("1")){