禅道问题调整1019

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

@@ -124,6 +124,36 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 
 			queryWrapper.eq("a.del_flag",0).groupBy("a.id").orderByDesc("a.create_time");
 			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);
+			for (SyLetterDeposit li:pageList.getRecords()){
+				//转换运抵国别
+				List<DictModel> sysDicts1 = sysDictService.queryDictItemsByCode("country_of_arrival");
+				for(DictModel di:sysDicts1){
+					if(di.getValue().equals(li.getArriveInCountry())){
+						li.setArriveInCountry(di.getText());
+					}
+				}
+				//转换目的港
+				List<DictModel> sysDicts = sysDictService.queryDictItemsByCode("port_of_destination");
+				for(DictModel di:sysDicts){
+					if(di.getValue().equals(li.getDestinationPort())){
+						li.setDestinationPort(di.getText());
+					}
+				}
+				//转换出口口岸
+				List<DictModel> sysDicts2 = sysDictService.queryDictItemsByCode("export_port");
+				for(DictModel di:sysDicts2){
+					if(di.getValue().equals(li.getDestinationPort())){
+						li.setDestinationPort(di.getText());
+					}
+				}
+				//转换贸易国别
+				List<DictModel> sysDicts3 = sysDictService.queryDictItemsByCode("trade_country");
+				for(DictModel di:sysDicts3){
+					if(di.getValue().equals(li.getDestinationPort())){
+						li.setDestinationPort(di.getText());
+					}
+				}
+			}
 			result.setSuccess(true);
 			result.setMessage("查询成功！");
 			result.setResult(pageList);

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

@@ -435,9 +435,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
    */
   @AutoLog(value = "发运明细主表-导出")
   @ApiOperation(value="发运明细主表-导出", notes="发运明细主表-导出")
-  @RequestMapping(value = "/exportXls")
-  public Result<String> exportXls(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
-								String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,String isElement,
+  @GetMapping(value = "/exportXls")
+  public Result<String> exportXls(SyShippingDetailsVo syShippingDetails,
 								@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								HttpServletResponse req) {
@@ -454,13 +453,13 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if(oConvertUtils.isNotEmpty(syShippingDetails.getOrderNumber())){
 		  queryWrapper.like("t.orderNumber",syShippingDetails.getOrderNumber());
 	  }
-	  if(oConvertUtils.isNotEmpty(startTime)){
-		  queryWrapper.ge("t.documentDate",startTime);
-		  queryWrapper.le("t.documentDate",endTime);
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getStartTime())){
+		  queryWrapper.ge("t.documentDate",syShippingDetails.getStartTime());
+		  queryWrapper.le("t.documentDate",syShippingDetails.getEndTime());
 	  }
-	  if(oConvertUtils.isNotEmpty(preDeliveryDateB)){
-		  queryWrapper.ge("t.preDeliveryDate",preDeliveryDateB);
-		  queryWrapper.le("t.preDeliveryDate",preDeliveryDateE);
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getPreDeliveryDateB())){
+		  queryWrapper.ge("t.preDeliveryDate",syShippingDetails.getPreDeliveryDateB());
+		  queryWrapper.le("t.preDeliveryDate",syShippingDetails.getPreDeliveryDateE());
 	  }
 
 	  if(oConvertUtils.isNotEmpty(syShippingDetails.getSalesman())){
@@ -469,14 +468,14 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if(oConvertUtils.isNotEmpty(syShippingDetails.getItemNumber())){
 		  queryWrapper.like("t.itemNumber",syShippingDetails.getItemNumber());
 	  }
-	  if(oConvertUtils.isNotEmpty(refer)){
-		  queryWrapper.eq("t.isReference",refer);
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getRefer())){
+		  queryWrapper.eq("t.isReference",syShippingDetails.getRefer());
 	  }
-	  if(oConvertUtils.isNotEmpty(supplier)){
-		  queryWrapper.like("t.supplier",supplier);
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getSupplier())){
+		  queryWrapper.like("t.supplier",syShippingDetails.getSupplier());
 	  }
-	  if(oConvertUtils.isNotEmpty(isElement)){
-		  if(isElement.equals("0")){//没有维护
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getIsElement())){
+		  if(syShippingDetails.getIsElement().equals("0")){//没有维护
 			  queryWrapper.isNull("t.elementsId");
 		  }else{
 			  queryWrapper.isNotNull("t.elementsId");
@@ -489,7 +488,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	  try {
 		  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
-		  if(flourOrGarment.equals("0")){//面辅料
+		  if(syShippingDetails.getFlourOrGarment().equals("0")){//面辅料
 			  List<SyShippingDetailsVo> itemList = syShippingDetailsMapper.excelItem(queryWrapper);
 
 			  org.jeecgframework.poi.excel.entity.TemplateExportParams params = new org.jeecgframework.poi.excel.entity.TemplateExportParams("D:\\单证模板\\出运面辅料数据.xlsx");
@@ -499,6 +498,11 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 			  //集合转map
 			  for(SyShippingDetailsVo li:itemList){
+			  	if(oConvertUtils.isEmpty(li.getElementsId())){
+					result.setSuccess(false);
+					result.setMessage("报关要素未维护，不允许导出！");
+					return result;
+				}
 				  Field[] fieldsList = li.getClass().getDeclaredFields();
 				  Map<String, Object> mapList = new HashMap<String, Object>();
 				  for (Field field : fieldsList) {
@@ -519,6 +523,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  }else{//成衣
 			  IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
 			  for(SyShippingDetailsVo li:pageList.getRecords()){
+				  if(oConvertUtils.isEmpty(li.getElementsId())){
+					  result.setSuccess(false);
+					  result.setMessage("报关要素未维护，不允许导出！");
+					  return result;
+
+				  }
 				  String pre = sf.format(li.getPreDeliveryDate());
 				  //用到货日期代替一下预发货日期
 				  li.setArrivalDate(pre);
@@ -1184,7 +1194,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		 mv.addObject(NormalExcelConstants.FILE_NAME, "发运明细数据");
 		 mv.addObject(NormalExcelConstants.CLASS, SyShippingDetailsVo.class);
-		 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("发运明细数据", "导出人:admin" , "成本分配"));
+		 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("发运明细数据", "导出人:admin" , "发运明细"));
 		 mv.addObject(NormalExcelConstants.DATA_LIST, pageList.getRecords());
 		 return mv;
 	 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyShippingDetailsVo.java

@@ -115,7 +115,15 @@ public class SyShippingDetailsVo {
     @Excel(name = "款号", width = 15)
     @ApiModelProperty(value = "款号")
     private String itemNumber;
-    @Excel(name = "到货日期", width = 20, format = "yyyy-MM-dd")
+
+    /**预完工日期*/
+    @Excel(name = "预完工日期", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "预完工日期")
+    private java.util.Date preCompletionDate;
+
+  //  @Excel(name = "到货日期", width = 20, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "到货日期")
@@ -261,12 +269,7 @@ public class SyShippingDetailsVo {
     @ApiModelProperty(value = "销售类型文本")
     private java.lang.String salesTypeText;
 
-    /**预完工日期*/
-    @Excel(name = "预完工日期", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预完工日期")
-    private java.util.Date preCompletionDate;
+
 
     /**规格型号*/
     @Excel(name = "规格型号", width = 15)
@@ -301,4 +304,13 @@ public class SyShippingDetailsVo {
 
     //单位
     private String masterMetering;
+
+
+    //导出条件
+    private String startTime;
+    private String endTime;
+    private String refer;
+    private String preDeliveryDateB;
+    private String preDeliveryDateE;
+    private String isElement;
 }

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

@@ -86,7 +86,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	@AutoLog(value = "托书主表实体类-分页列表查询")
 	@ApiOperation(value="托书主表实体类-分页列表查询", notes="托书主表实体类-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,String OrderDate,String smailPo,String type,
+	public Result<IPage<SyShippingOrder>> queryPageList(SyShippingOrder syShippingOrder,String shippingOrderDate,String smailPo,String type,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -96,11 +96,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getOrderNumber())){
 			queryWrapper.like("b.order_number",syShippingOrder.getOrderNumber());
 		}
-		if(oConvertUtils.isNotEmpty(OrderDate)){
-			queryWrapper.eq("a.shipping_order_date",OrderDate);
+		if(oConvertUtils.isNotEmpty(shippingOrderDate)){
+			queryWrapper.eq("a.shipping_order_date",shippingOrderDate);
 		}
 		if(oConvertUtils.isNotEmpty(syShippingOrder.getClientAbbreviation())){
-			queryWrapper.eq("a.client_abbreviation",syShippingOrder.getClientAbbreviation());
+			queryWrapper.eq("b.client_abbreviation",syShippingOrder.getClientAbbreviation());
 		}
 		if(oConvertUtils.isNotEmpty(smailPo)){
 			queryWrapper.eq("b.smail_po",smailPo);