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/capacity/controller/SyCapacityControlController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.capacity.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.capacity.entity.SyCapacityControl;
+import org.jeecg.modules.capacity.service.ISyCapacityControlService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 产能控制
+ * @Author: jeecg-boot
+ * @Date:   2022-10-19
+ * @Version: V1.0
+ */
+@Api(tags="产能控制")
+@RestController
+@RequestMapping("/capacity/syCapacityControl")
+@Slf4j
+public class SyCapacityControlController extends JeecgController<SyCapacityControl, ISyCapacityControlService> {
+	@Autowired
+	private ISyCapacityControlService syCapacityControlService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param syCapacityControl
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "产能控制-分页列表查询")
+	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<SyCapacityControl>> queryPageList(SyCapacityControl syCapacityControl,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SyCapacityControl> queryWrapper = QueryGenerator.initQueryWrapper(syCapacityControl, req.getParameterMap());
+		Page<SyCapacityControl> page = new Page<SyCapacityControl>(pageNo, pageSize);
+		IPage<SyCapacityControl> pageList = syCapacityControlService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param syCapacityControl
+	 * @return
+	 */
+	@AutoLog(value = "产能控制-添加")
+	@ApiOperation(value="产能控制-添加", notes="产能控制-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody SyCapacityControl syCapacityControl) {
+		syCapacityControlService.save(syCapacityControl);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param syCapacityControl
+	 * @return
+	 */
+	@AutoLog(value = "产能控制-编辑")
+	@ApiOperation(value="产能控制-编辑", notes="产能控制-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody SyCapacityControl syCapacityControl) {
+		syCapacityControlService.updateById(syCapacityControl);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "产能控制-通过id删除")
+	@ApiOperation(value="产能控制-通过id删除", notes="产能控制-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		syCapacityControlService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "产能控制-批量删除")
+	@ApiOperation(value="产能控制-批量删除", notes="产能控制-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.syCapacityControlService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "产能控制-通过id查询")
+	@ApiOperation(value="产能控制-通过id查询", notes="产能控制-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<SyCapacityControl> queryById(@RequestParam(name="id",required=true) String id) {
+		SyCapacityControl syCapacityControl = syCapacityControlService.getById(id);
+		if(syCapacityControl==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(syCapacityControl);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param syCapacityControl
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, SyCapacityControl syCapacityControl) {
+        return super.exportXls(request, syCapacityControl, SyCapacityControl.class, "产能控制");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, SyCapacityControl.class);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/entity/SyCapacityControl.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.capacity.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 产能控制
+ * @Author: jeecg-boot
+ * @Date:   2022-10-19
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_capacity_control")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sy_capacity_control对象", description="产能控制")
+public class SyCapacityControl implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**供应商*/
+	@Excel(name = "供应商", width = 15)
+    @ApiModelProperty(value = "供应商")
+    private java.lang.String supplier;
+	/**供应商编码*/
+	@Excel(name = "供应商编码", width = 15)
+    @ApiModelProperty(value = "供应商编码")
+    private java.lang.String supplierCode;
+	/**产能额度（月）*/
+	@Excel(name = "产能额度（月）", width = 15)
+    @ApiModelProperty(value = "产能额度（月）")
+    private java.math.BigDecimal capacityQuota;
+	/**工时（月）*/
+	@Excel(name = "工时（月）", width = 15)
+    @ApiModelProperty(value = "工时（月）")
+    private java.lang.String workingHours;
+	/**产能额度上浮区间*/
+	@Excel(name = "产能额度上浮区间", width = 15)
+    @ApiModelProperty(value = "产能额度上浮区间")
+    private java.lang.String capacitySection;
+	/**供应商状态*/
+	@Excel(name = "供应商状态", width = 15)
+    @ApiModelProperty(value = "供应商状态")
+    private java.lang.Integer supplierState;
+	/**备注（用于填写红灯原因）*/
+	@Excel(name = "备注（用于填写红灯原因）", width = 15)
+    @ApiModelProperty(value = "备注（用于填写红灯原因）")
+    private java.lang.String remarks;
+	/**数据状态（删除，保存）*/
+	@Excel(name = "数据状态（删除，保存）", width = 15)
+    @ApiModelProperty(value = "数据状态（删除，保存）")
+    private java.lang.Integer state;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/SyCapacityControlMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.capacity.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.capacity.entity.SyCapacityControl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 产能控制
+ * @Author: jeecg-boot
+ * @Date:   2022-10-19
+ * @Version: V1.0
+ */
+public interface SyCapacityControlMapper extends BaseMapper<SyCapacityControl> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.capacity.mapper.SyCapacityControlMapper">
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/ISyCapacityControlService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.capacity.service;
+
+import org.jeecg.modules.capacity.entity.SyCapacityControl;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 产能控制
+ * @Author: jeecg-boot
+ * @Date:   2022-10-19
+ * @Version: V1.0
+ */
+public interface ISyCapacityControlService extends IService<SyCapacityControl> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.capacity.service.impl;
+
+import org.jeecg.modules.capacity.entity.SyCapacityControl;
+import org.jeecg.modules.capacity.mapper.SyCapacityControlMapper;
+import org.jeecg.modules.capacity.service.ISyCapacityControlService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 产能控制
+ * @Author: jeecg-boot
+ * @Date:   2022-10-19
+ * @Version: V1.0
+ */
+@Service
+public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlMapper, SyCapacityControl> implements ISyCapacityControlService {
+
+}

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/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -329,10 +329,10 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             //修改预装箱单主表参照状态
             SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
             entit.setId(li.getSyPreAssembledPackingListId());
-            entit.setDepositaryReceiptNo(null);
+            entit.setDepositaryReceiptNo("");
             entit.setIsReference(0);
-            entit.setContainerNumber(null);
-            entit.setContainerCode(null);
+            entit.setContainerNumber("");
+            entit.setContainerCode("");
             syPreAssembledPackingListService.updateById(entit);
 
             //查询预装箱单子表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataMapper.xml

@@ -12,9 +12,7 @@
             sales_type_value,
             sales_type_text,
             customer_abbreviation,
-            case customer_name when '森宇集团' then end_customer
-                                when '宁波森宇' then end_customer
-                                else customer_name end as customer_name,
+            customer_name,
             exchange_rate,
             sales_department,
             salesman,
@@ -29,7 +27,10 @@
             price_remarks,
             customer_order_number,
             sum(b.total_price_and_tax) as whole_order_total,
-            end_customer,
+            case customer_abbreviation
+            when '森宇集团' then end_customer
+            when '宁波森宇' then end_customer
+            else customer_abbreviation end as end_customer,
             term_of_payment,
             order_change_description,
             a.memo,

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,8 @@ 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 +499,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 +524,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 +1195,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/SyPreAssembledPackingListVo.java

@@ -200,7 +200,7 @@ public class SyPreAssembledPackingListVo {
         String fwSplit = fw[0]+"~"+fw[fw.length-1];
 
         return account+"*"+garmentFactory+"*"+preDeliveryDate+"*"+itemNumber+"*"+smallPo+"*"+distributionPoint+
-                "*"+""+"*"+""+"*"+""+"*"+""+"*"+builder+color+"*"+codingRules+"*"+""+"*"+plannedShippingQuantity+
+                "*"+""+"*"+""+"*"+""+"*"+""+"*"+builder+"*"+color+"*"+codingRules+"*"+""+"*"+plannedShippingQuantity+
                 "*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+""+"*"+unitPrice+
                 "*"+""+"*"+""+"*"+itemId+"*"+groupId+"*"+id+"*"+orderNumber+"*"+itemNuber+"*"+fwSplit+"*"+customer+"*"+customerAbb+"*"+elenmentId;
     }

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 = "到货日期")
@@ -170,12 +178,12 @@ public class SyShippingDetailsVo {
     private java.math.BigDecimal exchangeRate;
 
     /**整单合计*/
-    @Excel(name = "整单合计", width = 15)
+    //@Excel(name = "整单合计", width = 15)
     @ApiModelProperty(value = "整单合计")
     private java.math.BigDecimal wholeOrderTotal;
 
     /**币种文本*/
-    @Excel(name = "币种文本", width = 15)
+    //@Excel(name = "币种文本", width = 15)
     @ApiModelProperty(value = "币种文本")
     private java.lang.String currencyText;
 
@@ -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/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -238,7 +238,7 @@ ${ew.customSqlSegment}
         b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight,b.is_reference as isReference,
         b.excess_quantity as excessQuantity,d.master_metering as masterMetering,b.garment_factory as garmentFactory,
         b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
-        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel
+        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode
          from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id
@@ -246,7 +246,7 @@ left join sy_declaration_elements c
 on b.elements_id = c.id
 left join sy_order_data_item d
 on b.sy_order_data_item_id = d.id
-where a.del_flag = 0 and b.del_flag = 0) t
+where a.del_flag = 0 and b.del_flag = 0 and b.inventory_ccode NOT LIKE '19%') t
 ${ew.customSqlSegment}
     </select>
 

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);
@@ -372,7 +372,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		  }
 		  //预发货日期
 		  if(oConvertUtils.isNotEmpty(syPackingList.getPreDeliveryDate())){
-			  queryWrapper.eq("b.hot",syPackingList.getPreDeliveryDate());
+			  queryWrapper.between("b.hod",syPackingList.getPreDeliveryDate(),syPackingList.getPreDeliveryDate());
 		  }
 		  //供应商
 		  if(oConvertUtils.isNotEmpty(supplier)){

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

@@ -364,10 +364,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
-                syPackingListFabric.setShippingOrderNumber(null);
-                syPackingListFabric.setExportInvoiceNo(null);
-                syPackingListFabric.setContainerCode(null);
-                syPackingListFabric.setContainerNumber(null);
+                syPackingListFabric.setShippingOrderNumber("");
+                syPackingListFabric.setExportInvoiceNo("");
+                syPackingListFabric.setContainerCode("");
+                syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -377,10 +377,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
                 syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber(null);
-                syPackingListTailoring.setExportInvoiceNo(null);
-                syPackingListTailoring.setContainerCode(null);
-                syPackingListTailoring.setContainerNumber(null);
+                syPackingListTailoring.setShippingOrderNumber("");
+                syPackingListTailoring.setExportInvoiceNo("");
+                syPackingListTailoring.setContainerCode("");
+                syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
             //删除子表
@@ -448,10 +448,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
-                syPackingListFabric.setShippingOrderNumber(null);
-                syPackingListFabric.setExportInvoiceNo(null);
-                syPackingListFabric.setContainerCode(null);
-                syPackingListFabric.setContainerNumber(null);
+                syPackingListFabric.setShippingOrderNumber("");
+                syPackingListFabric.setExportInvoiceNo("");
+                syPackingListFabric.setContainerCode("");
+                syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -461,10 +461,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     throw new JeecgBootException("没有查询到装箱单成衣数据！");
                 }
                 syPackingListTailoring.setIsReference(0);
-                syPackingListTailoring.setShippingOrderNumber(null);
-                syPackingListTailoring.setExportInvoiceNo(null);
-                syPackingListTailoring.setContainerCode(null);
-                syPackingListTailoring.setContainerNumber(null);
+                syPackingListTailoring.setShippingOrderNumber("");
+                syPackingListTailoring.setExportInvoiceNo("");
+                syPackingListTailoring.setContainerCode("");
+                syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/AddOrderJob.java

@@ -440,10 +440,10 @@ public class AddOrderJob implements Job,ApplicationContextAware {
             for (JSONObject jsonObject:jian) {
                 syOrderDataVO = JSONObject.toJavaObject(jsonObject, SyOrderDataVO.class);
             }
-            if(result.getSupplier()==null){
+            if(syOrderDataVO.getSupplier()==null){
                 return syOrderDataVO;
             }
-            if(!result.getSupplier().equals("马菲羊")){
+            if(!syOrderDataVO.getSupplier().equals("马菲羊")){
                 return syOrderDataVO;
             }
             String sql2 = "SELECT" +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
@@ -759,6 +760,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                                         String stratDate,
                                                         String endDate,
                                                         String status) {
+        status="1";
         SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
@@ -1096,6 +1098,17 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             List<SyPreAssembledPackingListItem> items=new ArrayList<SyPreAssembledPackingListItem>();
             Sheet sheet=(Sheet) sheets.next();
             List<String> strs3=new ArrayList<String>();//获取尺码名称
+            List<String > list=new ArrayList<>();
+            List<Integer> nums=new ArrayList<>();
+            list.add("item NO./SKU NO./UPC NO./PACKS CODE");
+            list.add("PREACKSKU");
+            list.add("计划尺码数量");
+            list.add("净净重");
+            list.add("备注");
+            list.add("订单号");
+            list.add("尺码范围");
+            list.add("款号");
+            list.add("客户简称");
             for (int x=0;x<=sheet.getLastRowNum();x++){
                 Row row=sheet.getRow(x);//列
                 Cell cell2=row.getCell(0);
@@ -1111,22 +1124,27 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                 sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
                     }
                     cell.setCellType(CellType.STRING);//获取的都转换成String
+                    if(cell.getStringCellValue().length()<1&&x>0&&!nums.contains(i)){ 
+                        throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
+                                sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
+                    }
                     if(x==0){
                         if((i>9&&i<row.getLastCellNum()-28)||i==row.getLastCellNum()-9){
                             strs3.add(cell.getStringCellValue());
-                            System.out.print(String.format("\033[%dm%s\033[0m", 31, cell.getStringCellValue())+"\t");//颜色
+                        }
+                        if(list.contains(cell.getStringCellValue())){
+                            nums.add(i);
+                            System.out.println("字段\t"+cell.getStringCellValue()+"\t"+i);
                         }
                     }else{
                         if((i>9&&i<row.getLastCellNum()-28)||i==row.getLastCellNum()-9){
                             strs2.add(cell.getStringCellValue());
-                            System.out.print(String.format("\033[%dm%s\033[0m", 31, cell.getStringCellValue())+"\t");//颜色
                         }else{
                             strs.add(cell.getStringCellValue());
-                            System.out.print(cell.getStringCellValue()+"\t");
                         }
                     }
                 }
-                System.out.println();
+                System.out.println("nums\t"+nums);
                 if(x>0){
                     SyPreAssembledPackingListItem item=
                             new SyPreAssembledPackingListItem(strs.toArray(new String[strs.size()]),
@@ -1140,7 +1158,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             mains.add(main);
             //break;
         }
-        System.out.println("\nmains\t"+mains);
         boolean bool= syPreAssembledPackingListService.add(mains);
     //    System.out.println("bool\t"+bool);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -710,7 +710,6 @@ public class SyPackingListTailoringController {
 					 	//System.out.print(cell.getStringCellValue()+"\t");
 					 }
 				 }
-				 x=x<2?++x:x;//跨行
 				 if(x>3){
 					 SyPackingListTailoringItem item=new SyPackingListTailoringItem(
 							 		str.substring(0,str.length()-1).split(","),
@@ -720,6 +719,7 @@ public class SyPackingListTailoringController {
 				 }else if(x==1){
 					 main=new SyPackingListTailoring(strMain.substring(0,strMain.length()-1).split(","));
 				 }
+				 x=x<2?++x:x;//跨行
 
 			 }
 			 main.setSyPackingListTailoringItemList(items);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -218,5 +218,11 @@ public class SyPackingListTailoring implements Serializable {
 		//createTime=params[8];
 		elementsId=params[9];
 		syPreAssembledPackingListId=params[10];
+		//款号	30650	订单号	SYJ140-马菲羊	预托书号	预托书	集装箱号	集装箱2
+		itemNumber=params[11];
+		orderNumber=params[12];
+		depositaryReceiptNo=params[13];
+		containerNumber=params[14];
+		containerCode=params[15];
 	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -91,6 +91,7 @@
 		pieces_box,
 		box_number,/*箱数*/
 		SUM(total) total,/*件数*/
+		SUM(plan_Quantity) planQuantity,/*件数*/
 		net_weight,
 		sum(total_net_weight) total_net_weight,/*总净重*/
 		gross_weight,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -300,11 +300,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			for (SyPackingListTailoringItem item : items){
 				//循环子表获得尺码组
 				item.setSizeTables(sort(syPreAssembledPackingListItemMapper.querySize2(item.getGroupId(),item.getSyPreAssembledPackingListId())));
-				/*String planSize="";
+				String planSize="";
 				for (SizeTable size:item.getSizeTables()){
 					planSize+=size.getSize()+":"+size.getQuantity()+"+";
 				}
-				item.setPlanSize(planSize.substring(0,planSize.length()-1));*///截取最后一位+号
+				item.setPlanSize(planSize.substring(0,planSize.length()-1));//截取最后一位+号
 			}
 			syPackingListTailoring.setSyPackingListTailoringItemList(items);
 		}
@@ -490,6 +490,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						SyPackingListTailoringItem item1=item;
 						BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 						item1.setTotal(boxNumber);//该尺码件数
+						item1.setPlanQuantity(boxNumber);//计划装箱数量
 						item1.setActualPackingQty(boxNumber);//实际装箱数量
 						item1.setPlanQuantity(boxNumber);//计划装箱数量
 						item1.setSize(size.getSize());//获取尺码