染损报表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/DyeLossController.java

@@ -41,14 +41,6 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
     @Autowired
     private IDyeLossService dyeLossService;
 
-    //Result<IPage<DyeLoss>>
-    /*@AutoLog(value = "染损报表查询")
-    @ApiOperation(value="染损报表查询", notes="染损报表查询")
-    @RequestMapping(value = "/list",method = RequestMethod.GET)
-    public List<DyeLoss> list(DyeLossDto dyeLossDto){
-        return dyeLossService.select(dyeLossDto);
-    }*/
-
     @AutoLog(value = "染损报表查询")
     @ApiOperation(value="染损报表查询", notes="染损报表查询")
     @RequestMapping(value = "/list",method = RequestMethod.GET)
@@ -56,12 +48,13 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                          DyeLossDto dyeLossDto,
                                          HttpServletRequest req){
-        if(pageSize>100){//页面长度不能大于10
-            pageSize=100;
+        if(pageSize>10){//页面长度不能大于10
+            pageSize=10;
         }
         Result<IPage<DyeLoss>> result = new Result<IPage<DyeLoss>>();
         QueryWrapper<DyeLossDto> queryWrapper = new QueryWrapper<>();//初始化
-        queryWrapper.eq("c.cVCCode","0105");
+        queryWrapper.eq("c.cVCCode","0105");//确定为染厂
+        queryWrapper.eq("g.cRdBusType","委外发料");//选择为材料出库单
         if(dyeLossDto.getCode()!=null&& !dyeLossDto.getCode().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getCode())){ //code;//订单号
             queryWrapper.eq("a.cCode",dyeLossDto.getCode());
         }
@@ -85,13 +78,6 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
         return result;
     }
 
-    /*@AutoLog(value = "染损报表数据合计")
-    @ApiOperation(value="染损报表数据合计", notes="染损报表数据合计")
-    @RequestMapping(value = "/selectSum",method = RequestMethod.GET)
-    public Result<?> selectSum(){
-        Result.ok(dyeLossService.selectSum());
-        return Result.ok("查询成功!");
-    }*/
 
     @AutoLog(value = "按供应商名称按物料分组展现每个物料的染损")
     @ApiOperation(value="按供应商名称按物料分组展现每个物料的染损", notes="按供应商名称按物料分组展现每个物料的染损")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/SupplierCapacityController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.scas.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule;
 import org.jeecg.modules.scas.dto.SupplierCapacityDto;
 import org.jeecg.modules.scas.entity.DyeLoss;
 import org.jeecg.modules.scas.entity.SupplierCapacity;
@@ -37,27 +39,62 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* @Description: 供应商产能报表
+* @Description: 供应链产能报表
 * @Author: jeecg-boot
 * @Date:   2022-04-01
 * @Version: V1.0
 */
 @Slf4j
-@Api(tags="供应商产能报表")
+@Api(tags="供应链产能报表")
 @RestController
 @RequestMapping("/scas/supplierCapacity")
 public class SupplierCapacityController extends JeecgController<SupplierCapacity, ISupplierCapacityService> {
    @Autowired
    private ISupplierCapacityService SupplierCapacityService;
 
-   @AutoLog(value = "供应商产能报表查询-通过条件查询")
-   @ApiOperation(value="供应商产能报表查询-通过条件查询", notes="供应商产能报表查询-通过条件查询")
+   @AutoLog(value = "供应链产能报表查询-通过条件查询")
+   @ApiOperation(value="供应链产能报表查询-通过条件查询", notes="供应链产能报表查询-通过条件查询")
    @RequestMapping(value = "/list2",method = RequestMethod.GET)
    public Result<?> list2(SupplierCapacityDto supplierCapacityDto){
       System.out.println("supplierCapacityDto:"+supplierCapacityDto);
       return Result.ok(SupplierCapacityService.selectList(supplierCapacityDto));
    }
 
+   @AutoLog(value = "供应链产能报表查询-通过条件查询改")
+   @ApiOperation(value="供应链产能报表查询-通过条件查询改", notes="供应链产能报表查询-通过条件查询改")
+   @RequestMapping(value = "/list",method = RequestMethod.GET)
+   public Result<IPage<SupplierCapacity>> list(SupplierCapacityDto supplierCapacityDto, HttpServletRequest req){
+     //System.out.println("supplierCapacityDto:"+supplierCapacityDto);
+      Result<IPage<SupplierCapacity>> result = new Result<IPage<SupplierCapacity>>();
+      QueryWrapper<SupplierCapacityDto> queryWrapper = new QueryWrapper<>();//初始化
+      if(StringUtils.isNotBlank(supplierCapacityDto.getCsrccode())){//订单号
+         queryWrapper.eq("PO_Pomain.cPOID",supplierCapacityDto.getCsrccode());
+      }
+      if(StringUtils.isNotBlank(supplierCapacityDto.getVenCode())){//供应商
+         queryWrapper.eq("Vendor.cVenName",supplierCapacityDto.getVenCode());
+      }
+      if(StringUtils.isNotBlank(supplierCapacityDto.getPlanLotNumber())){//计划单号
+         queryWrapper.eq("PO_Podetails.planLotNumber",supplierCapacityDto.getPlanLotNumber());
+      }
+      if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){//起始日期
+         queryWrapper.ge("month(PO_Podetails.dArriveDate)",supplierCapacityDto.getStartDate().toString());
+      }
+      if(supplierCapacityDto.getEndDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getEndDate().toString())){//起始日期
+         queryWrapper.le("month(PO_Podetails.dArriveDate)",supplierCapacityDto.getEndDate().toString());
+      }
+      //queryWrapper.eq("cPOID",supplierCapacityDto.getCsrccode());
+      //SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+      Page<SupplierCapacity> page = new Page<SupplierCapacity>(supplierCapacityDto.getPageNo(), supplierCapacityDto.getPageSize());
+      //      //System.out.println("QueryWrapper:"+queryWrapper);
+      IPage<SupplierCapacity> pageList = SupplierCapacityService.selectPage(page, queryWrapper);
+      result.setSuccess(true);
+      result.setResult(pageList);
+      result.setMessage("查询成功");
+      System.out.println("result.getResult().getTotal():"+result.getResult().getTotal());
+      System.out.println("pageList.getSize():"+pageList.getSize());
+      return result;
+   }
+
    /*@AutoLog(value = "供应商产能报表查询-通过条件查询")
    @ApiOperation(value="供应商产能报表查询-通过条件查询", notes="供应商产能报表查询-通过条件查询")
    @RequestMapping(value = "/list3",method = RequestMethod.GET)
@@ -66,22 +103,22 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
       return Result.ok(SupplierCapacityService.selectList2(supplierCapacityDto));
    }*/
 
-   @AutoLog(value = "成本分配汇总-通过部门、供应商、月份excel导出")
-   @ApiOperation(value="成本分配汇总-通过部门、供应商、月份excel导出", notes="成本分配汇总-通过部门、供应商、月份excel导出")
+   @AutoLog(value = "供应链产能报表-通过部门、供应商、月份excel导出")
+   @ApiOperation(value="供应链产能报表-通过部门、供应商、月份excel导出", notes="供应链产能报表-通过部门、供应商、月份excel导出")
    @RequestMapping(value = "/excel1",method = RequestMethod.GET)
    public ModelAndView  excel1() {
       return super.export("供应商产能报表测试", SupplierCapacityVo1.class,SupplierCapacityService.excel1());
    }
 
-   @AutoLog(value = "成本分配汇总-通过部门、月份excel导出")
-   @ApiOperation(value="成本分配汇总-通过部门、月份excel导出", notes="成本分配汇总-通过部门、月份excel导出")
+   @AutoLog(value = "供应链产能报表-通过部门、月份excel导出")
+   @ApiOperation(value="供应链产能报表-通过部门、月份excel导出", notes="供应链产能报表-通过部门、月份excel导出")
    @RequestMapping(value = "/excel2",method = RequestMethod.GET)
    public ModelAndView  excel2() {
       return super.export("供应商产能报表测试", SupplierCapacityVo2.class,SupplierCapacityService.excel2());
    }
 
-   @AutoLog(value = "成本分配汇总-通过供应商、月份excel导出")
-   @ApiOperation(value="成本分配汇总-通过供应商、月份excel导出", notes="成本分配汇总-通过供应商、月份excel导出")
+   @AutoLog(value = "供应链产能报表-通过供应商、月份excel导出")
+   @ApiOperation(value="供应链产能报表-通过供应商、月份excel导出", notes="供应链产能报表-通过供应商、月份excel导出")
    @RequestMapping(value = "/excel3",method = RequestMethod.GET)
    public ModelAndView  excel3() {
       return super.export("供应商产能报表测试", SupplierCapacityVo3.class,SupplierCapacityService.excel3());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/SyCostAllocationSummaryController.java

@@ -14,6 +14,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.scas.entity.DyeLoss;
 import org.jeecg.modules.scas.entity.SyCostAllocationSummary;
 import org.jeecg.modules.scas.service.ISyCostAllocationSummaryService;
 import java.util.Date;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/dto/SupplierCapacityDto.java

@@ -1,18 +1,28 @@
 package org.jeecg.modules.scas.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class SupplierCapacityDto {
+
+    @ApiModelProperty(value = "订单号")
     private String csrccode;//订单号
-    private String cPlanLotNumber;//计划单号
-    private String cVenCode;//供应商
-    private String iOrderType;//订单类型
-    private int excelType;//导出类型
+
+    @ApiModelProperty(value = "计划单号" )
+    private String planLotNumber;//计划单号
+
+    @ApiModelProperty(value = "供应商")
+    private String venCode;//供应商
+
+    @ApiModelProperty(value = "订单类型(委外订单、采购订单)")
+    private String orderType;//订单类型
 
    /* @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -22,11 +32,16 @@ public class SupplierCapacityDto {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endDate;//结束日期*/
 
+    @ApiModelProperty(value = "开始月份")
     private Integer startDate;//开始月份
 
+    @ApiModelProperty(value = "结束月份")
     private Integer endDate;//结束月份
 
-    private Integer pageNo=1;//当前页
+    @ApiModelProperty(value = "当前页面")
+    private Integer pageNo=1;//当前页面
+
+    @ApiModelProperty(value = "页面大小")
     private Integer pageSize=20;//页面大小
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/entity/DyeLoss.java

@@ -29,4 +29,6 @@ public class DyeLoss {
     private BigDecimal iMSQuantity;//核销数量
     @Excel(name = "染损", width = 15,suffix = "%"/*,numFormat="##.00"*/)
     private BigDecimal dyeLossRate;//染损
+
+    private String cInvNameColor;//物料名称和颜色
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/entity/SupplierCapacity.java

@@ -8,9 +8,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-@ApiModel(description="供应商产能报表")
+@ApiModel(description="供应链产能报表")
 public class SupplierCapacity {
-
     private String csrccode;//订单号
     private String cPlanLotNumber;//计划单号
     private String cDepCode;//部门
@@ -24,7 +23,4 @@ public class SupplierCapacity {
     private Integer arriveMonth;//计划到货月份
     private Date dArriveDate;//计划到货日期
     private BigDecimal coefficient;//系数
-
-
-
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/entity/SyCostAllocationSummary.java

@@ -31,73 +31,73 @@ public class SyCostAllocationSummary {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-	private java.lang.String id;
+	private String id;
 	/**创建人*/
 	@Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建日期*/
 	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
-	private java.util.Date createTime;
+	private Date createTime;
 	/**修改人*/
 	@Excel(name = "修改人", width = 15)
     @ApiModelProperty(value = "修改人")
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**修改日期*/
 	@Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改日期")
-	private java.util.Date updateTime;
+	private Date updateTime;
 	/**组织*/
 	@Excel(name = "组织", width = 15)
     @ApiModelProperty(value = "组织")
-	private java.lang.String pkOrg;
+	private String pkOrg;
 	/**删除状态*/
 	@Excel(name = "删除状态", width = 15)
     @ApiModelProperty(value = "删除状态")
-	private java.lang.String delFlag;
+	private String delFlag;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
-	private java.lang.Object memo;
+	private Object memo;
 	/**序号*/
 	@Excel(name = "序号", width = 15)
     @ApiModelProperty(value = "序号")
-	private java.lang.String serialNumber;
+	private String serialNumber;
 	/**计划单号*/
 	@Excel(name = "计划单号", width = 15)
     @ApiModelProperty(value = "计划单号")
-	private java.lang.String syOrderDataId;
+	private String syOrderDataId;
 	/**款号*/
 	@Excel(name = "款号", width = 15)
     @ApiModelProperty(value = "款号")
-	private java.lang.String styleNumber;
+	private String styleNumber;
 	/**业务员*/
 	@Excel(name = "业务员", width = 15)
     @ApiModelProperty(value = "业务员")
-	private java.lang.String salesman;
+	private String salesman;
 	/**部门*/
 	@Excel(name = "部门", width = 15)
     @ApiModelProperty(value = "部门")
-	private java.lang.String department;
+	private String department;
 	/**客户简称*/
 	@Excel(name = "客户简称", width = 15)
     @ApiModelProperty(value = "客户简称")
-	private java.lang.String clientAbbreviation;
+	private String clientAbbreviation;
 	/**加工单位*/
 	@Excel(name = "加工单位", width = 15)
     @ApiModelProperty(value = "加工单位")
-	private java.lang.String processUnit;
+	private String processUnit;
 	/**出运日期*/
 	@Excel(name = "出运日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "出运日期")
-	private java.util.Date theShipmentDate;
+	private Date theShipmentDate;
 	/**成衣件数*/
 	@Excel(name = "成衣件数", width = 15)
     @ApiModelProperty(value = "成衣件数")
@@ -141,9 +141,9 @@ public class SyCostAllocationSummary {
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
-	private java.lang.Object remarks;
+	private Object remarks;
 	/**审核状态*/
 	@Excel(name = "审核状态", width = 15)
     @ApiModelProperty(value = "审核状态")
-	private java.lang.String auditState;
+	private String auditState;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/DyeLossMapper.java

@@ -16,15 +16,12 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface DyeLossMapper extends BaseMapper<DyeLoss> {
-    List<DyeLoss> querySelect(DyeLossDto dyeLossDto);
 
-    List<DyeLoss> selectSum();
+    IPage<DyeLoss> selectPage(IPage<DyeLoss> page, @Param("ew") QueryWrapper<DyeLossDto> queryWrapper);
 
     List<DyeLoss> selectVendor(String name);
 
     List<DyeLoss> selectCInvName();
 
     List<DyeLoss> excel();
-
-    IPage<DyeLoss> selectPage(IPage<DyeLoss> page, @Param("ew") QueryWrapper<DyeLossDto> queryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/SupplierCapacityMapper.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.scas.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.scas.dto.SupplierCapacityDto;
 import org.jeecg.modules.scas.entity.SupplierCapacity;
 import org.jeecg.modules.scas.entity.vo.SupplierCapacityVo1;
@@ -18,6 +22,7 @@ import java.util.Map;
  * @Date:   2022-04-02
  * @Version: V1.0
  */
+@Mapper
 public interface SupplierCapacityMapper extends BaseMapper<SupplierCapacity> {
 
     List<SupplierCapacity> querySelect(SupplierCapacityDto supplierCapacityDto);
@@ -27,4 +32,6 @@ public interface SupplierCapacityMapper extends BaseMapper<SupplierCapacity> {
     List<SupplierCapacityVo2> excel002();
 
     List<SupplierCapacityVo3> excel003();
+
+    IPage<SupplierCapacity> selectPage(IPage<SupplierCapacity> page, @Param("ew") QueryWrapper<SupplierCapacityDto> queryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/DyeLossMapper.xml

@@ -1,136 +1,58 @@
 <?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.scas.mapper.DyeLossMapper">
-    <select id="querySelect" resultType="org.jeecg.modules.scas.entity.DyeLoss" parameterType="org.jeecg.modules.scas.dto.DyeLossDto">
-        select * from
-        (select	ROW_NUMBER() OVER(ORDER BY OM_MOMain.moid) index1,
-        Inventory.cinvcode,--物料编码
-        Inventory.cInvName,--物料名称
-        OM_MODetails.cfree1 color,--颜色
-        cVenName cVenName,--供应商
-        OM_MOMain.cCode cCode,--订单号
-        OM_MODetails.iQuantity,--订单数量
-
-        iReceivedQTY iQuantity2,--采购入库数
-        --(select sum(iQuantity) from rdrecords01 where OM_MODetails.MODetailsID=rdrecords01.iOMoDID) iQuantity2,--采购入库数
-
-		iMaterialSendQty iQuantity3,--材料出库数
-		--(select sum(iQuantity) from rdrecords11 where OM_MODetails.MODetailsID=rdrecords11.iOMoDID) iQuantity3,--材料出库数
-
-        (select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-				left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-				where OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid) iMSQuantity,--核销数量
-
-		(1-iReceivedQTY/NULLIF((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-				left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-				where OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid),0))*100 dyeLossRate--染损
-
-        from OM_MOMain
-        left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-        left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-        left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-        --left join OM_MatSettleVouch on  OM_MOMain.cCode=OM_MatSettleVouch.cMOCode
-        --left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        <where>
-            <if  test="true">
-                and  Vendor.cVCCode='0105'--染厂
-            </if>
-            <if  test="code!=null">
-                and cCode=#{code} -- 订单号
-            </if>
-            <if  test="venName!=null">
-                and cVenName=#{venName} -- 供应商名称
-            </if>
-            <if  test="orderType!=null">
-                and iOrderType=#{orderType} --订单类型
-            </if>
-            <if  test="planLotNumber!=null">
-                and cPlanLotNumber=#{planLotNumber} --计划单号
-            </if>
-            <if  test="isosid!=null">
-                and isosid=#{isosid} --销售订单号
-            </if>
-        </where>
-        ) p	--计划时间
-        where p.index1&gt;=${pageNo*pageSize-pageSize} and p.index1&lt;=${pageSize*pageNo}
-    </select>
 
     <select id="selectPage" resultType="org.jeecg.modules.scas.entity.DyeLoss" >
-    select * from(
-        select
+     select
         d.cinvcode,--物料编码
         d.cInvName,--物料名称
         b.cfree1 color,--颜色
         cVenName cVenName,--供应商
         a.cCode cCode,--订单号
-        b.iQuantity,--订单数量
-
-        iReceivedQTY iQuantity2,--采购入库数
-
-        iMaterialSendQty iQuantity3,--材料出库数
-
-        (select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid) iMSQuantity,--核销数量
-
-        (1-iReceivedQTY/NULLIF((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where b.MODetailsID=OM_MatSettleVouch.modetailsid),0))*100 dyeLossRate--染损
-
+        b.iQuantity iQuantity,--订单数量
+        ISNULL(iReceivedQTY, 0 ) iQuantity2,--采购入库数
+        ISNULL(iMaterialSendQty, 0 ) iQuantity3,--材料出库数
+        ISNULL(g.iMSQuantity, 0 ) iMSQuantity,--核销数量
+        ISNULL((1-iReceivedQTY/NULLIF(g.iMSQuantity,0))*100,0) dyeLossRate--染损
         from OM_MOMain a
         left join OM_MODetails b on b.moid=a.moid
         left join Vendor c on c.cVenCode=a.cVenCode
         left join Inventory d on b.cInvCode=d.cInvCode
         left join SO_SODetails e on e.iSOsID =b.iSOsID
-         ${ew.customSqlSegment})p--染厂
+        left join OM_MatSettleVouch f on  b.MODetailsID =f.MODetailsID
+        left join OM_MatSettleVouchs g on g.msid=f.msid
+       ${ew.customSqlSegment}
     </select>
 
-    <select  id="selectSum" resultType="org.jeecg.modules.scas.entity.DyeLoss">
-        --染损报表合计
-        select  sum(OM_MODetails.iQuantity) iQuantity2,
-				sum(iReceivedQTY) iQuantity3,--采购入库数
-				sum(iMaterialSendQty) iMSQuantity,--材料出库数
-				sum(iMSQuantity) dyeLossRate--核销数量
-        from OM_MOMain
-        left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-        left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-        left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-        left join OM_MatSettleVouch on  OM_MOMain.cCode=OM_MatSettleVouch.cMOCode
-        left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105'
-    </select>
     
     <select id="selectVendor"  resultType="org.jeecg.modules.scas.entity.DyeLoss" parameterType="java.lang.String">--选择供应商按物料分组展现每个物料的染损
         select
             cInvName,--物料名称
-            iQuantity2,--入库数量
-            iMSQuantity,--核销数量
-            (1-(iQuantity2/iMSQuantity)) dyeLossRate--染损数量
+			color,--颜色
+			cInvName+' '+color cInvNameColor,--物料和颜色
+            --(iMSQuantity/iQuantity2)*100 dyeLossRate--合格率
+            (1-(iQuantity2/NULLIF(iMSQuantity,0)))*100 dyeLossRate--染损率
          from
         (select Inventory.cInvName,--物料名称
+				OM_MODetails.cfree1 color,--颜色
             sum(iReceivedQTY) iQuantity2,--入库数量
-            sum(iMSQuantity) iMSQuantity,--核销数量
-            sum(1-(iReceivedQTY/iMSQuantity)) dyeLossRate--染损
+            sum(iMSQuantity) iMSQuantity--核销数量
         from OM_MOMain
         left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
         left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
         left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-	    left join OM_MatSettleVouch on  OM_MOMain.cCode=OM_MatSettleVouch.cMOCode
+				left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID--绑定委外订单子表
         left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105'
+        where Vendor.cVCCode='0105' and  OM_MatSettleVouchs.cRdBusType='委外发料'
 				AND cVenName=#{value}
-				GROUP BY Inventory.cInvName)p
-
-
-
+				GROUP BY Inventory.cInvName,OM_MODetails.cfree1)p
     </select>
 
 
     <select id="selectCInvName"  resultType="org.jeecg.modules.scas.entity.DyeLoss">--按供应商分组展现每个供应商的染损
-		select 	cVenName,--供应商名称
-				iQuantity2,--入库数量
-				iMSQuantity,--核销数量
-				(1-(iQuantity2/iMSQuantity)) dyeLossRate
+
+        select 	cVenName,--供应商名称
+			    (1-(iQuantity2/NULLIF(iMSQuantity,0)))*100 dyeLossRate--染损
         from (
         select
             cVenName,--供应商名称
@@ -141,45 +63,33 @@
             left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
             left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
             left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-            left join OM_MatSettleVouch on  OM_MOMain.cCode=OM_MatSettleVouch.cMOCode
+            left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID
             left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105'
+        where Vendor.cVCCode='0105' and  OM_MatSettleVouchs.cRdBusType='委外发料'
         GROUP BY cVenName) p
     </select>
 
 
     <select id="excel" resultType="org.jeecg.modules.scas.entity.DyeLoss">
-        select * from
-        (select	ROW_NUMBER() OVER(ORDER BY OM_MOMain.moid) index1,
-        Inventory.cinvcode,--物料编码
-        Inventory.cInvName,--物料名称
-        OM_MODetails.cfree1 color,--颜色
+    select
+        d.cinvcode,--物料编码
+        d.cInvName,--物料名称
+        b.cfree1 color,--颜色
         cVenName cVenName,--供应商
-        OM_MOMain.cCode cCode,--订单号
-        OM_MODetails.iQuantity,--订单数量
-
-        iReceivedQTY iQuantity2,--采购入库数
-        --(select sum(iQuantity) from rdrecords01 where OM_MODetails.MODetailsID=rdrecords01.iOMoDID) iQuantity2,--采购入库数
-
-		iMaterialSendQty iQuantity3,--材料出库数
-		--(select sum(iQuantity) from rdrecords11 where OM_MODetails.MODetailsID=rdrecords11.iOMoDID) iQuantity3,--材料出库数
-
-        (select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-				left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-				where OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid) iMSQuantity,--核销数量
-
-		(1-iReceivedQTY/NULLIF((select sum(OM_MatSettleVouchs.iMSQuantity) from OM_MatSettleVouch
-				left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-				where OM_MODetails.MODetailsID=OM_MatSettleVouch.modetailsid),0))*100 dyeLossRate--染损
-
-        from OM_MOMain
-        left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-        left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-        left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-        --left join OM_MatSettleVouch on  OM_MOMain.cCode=OM_MatSettleVouch.cMOCode
-        --left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105'
-        ) p	--计划时间
+        a.cCode cCode,--订单号
+        b.iQuantity iQuantity,--订单数量
+        ISNULL(iReceivedQTY, 0 ) iQuantity2,--采购入库数
+        ISNULL(iMaterialSendQty, 0 ) iQuantity3,--材料出库数
+        ISNULL(g.iMSQuantity, 0 ) iMSQuantity,--核销数量
+        ISNULL((1-iReceivedQTY/NULLIF(g.iMSQuantity,0))*100,0) dyeLossRate--染损
+        from OM_MOMain a
+        left join OM_MODetails b on b.moid=a.moid
+        left join Vendor c on c.cVenCode=a.cVenCode
+        left join Inventory d on b.cInvCode=d.cInvCode
+        left join SO_SODetails e on e.iSOsID =b.iSOsID
+        left join OM_MatSettleVouch f on  b.MODetailsID =f.MODetailsID
+        left join OM_MatSettleVouchs g on g.msid=f.msid
+        where c.cVCCode='0105' and  g.cRdBusType='委外发料'
     </select>
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/SupplierCapacityMapper.xml

@@ -55,14 +55,14 @@
             <if test="csrccode!=null">
                 and csrccode=#{csrccode}----订单号
             </if>
-            <if test="iOrderType!=null">
-                AND iOrderType=#{iOrderType}--订单类型
+            <if test="orderType!=null">
+                AND iOrderType=#{orderType}--订单类型
             </if>
-            <if test="cVenCode!=null">
-                and cVenCode=#{cVenCode}--供应商
+            <if test="venCode!=null">
+                and cVenCode=#{venCode}--供应商
             </if>
-            <if test="cPlanLotNumber!=null">
-                and cPlanLotNumber=#{cPlanLotNumber}--计划单号
+            <if test="planLotNumber!=null">
+                and cPlanLotNumber=#{planLotNumber}--计划单号
             </if>
             <if test="startDate!=null">
                 and arriveMonth&gt;=$#{startDate}  --起始日期
@@ -76,6 +76,80 @@
         where s.index1&gt;=${pageNo*pageSize-pageSize} and s.index1&lt;=${pageSize*pageNo}
     </select>
 
+
+    <select id="selectPage" resultType="org.jeecg.modules.scas.entity.SupplierCapacity">
+        /*select  * from
+        (select ROW_NUMBER() OVER(ORDER BY cVenCode) index1,* from
+        (*/select	--ROW_NUMBER() OVER(ORDER BY PO_Pomain.poid) index1,
+        PO_Pomain.cPOID csrccode,
+        PlanLotNumber cPlanLotNumber,
+        cDepname cDepCode,
+        cPersonName cPersonCode,
+        cVenName cVenCode,
+        cVCName cVenCodeType,
+        '采购订单' iOrderType,
+        iQuantity,
+        iReceivedQTY,
+        cComUnitName unit,
+        month(dArriveDate) arriveMonth,
+        dArriveDate,
+        isnull(Inventory.cInvDefine1,0) coefficient
+        from PO_Pomain
+        left join PO_Podetails on PO_Podetails.POID=PO_Pomain.POID
+        left join Department on  Department.cdepcode=PO_Pomain.cDepCode
+        left join Person on	Person.cPersonCode=PO_Pomain.cPersonCode
+        left join Vendor on Vendor.cVenCode=PO_Pomain.cVenCode
+        left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
+        left join ComputationUnit on PO_Podetails.cUnitID=ComputationUnit.cComunitCode
+        left join Inventory on PO_Podetails.cInvCode=Inventory.cInvCode
+        ${ew.customSqlSegment}
+        <!--union
+        select	&#45;&#45;ROW_NUMBER() OVER(ORDER BY OM_MOMain.moid) index1,
+        OM_MOMain.cCode csrccode,
+        cPlanLotNumber,
+        cDepname cDepCode,
+        cPersonName cPersonCode,
+        cVenName cVenCode,
+        cVCName cVenCodeType,
+        '委外订单' iOrderType,
+        iQuantity,
+        iReceivedQTY,
+        cComUnitName unit,
+        month(dArriveDate) arriveMonth,
+        dArriveDate,
+        isnull(Inventory.cInvDefine1,0) coefficient
+        from OM_MOMain
+        left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
+        left join Department on  Department.cdepcode=OM_MOMain.cDepCode
+        left join Person on	Person.cPersonCode=OM_MOMain.cPersonCode
+        left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
+        left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
+        left join ComputationUnit on OM_MODetails.cUnitID=ComputationUnit.cComunitCode
+        left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
+        ) p
+        <where>
+            <if test="qw.csrccode!=null">
+                and csrccode=#{qw.csrccode}&#45;&#45;&#45;&#45;订单号
+            </if>
+            <if test="qw.orderType!=null">
+                AND iOrderType=#{qw.orderType}&#45;&#45;订单类型
+            </if>
+            <if test="qw.venCode!=null">
+                and cVenCode=#{qw.venCode}&#45;&#45;供应商
+            </if>
+            <if test="qw.planLotNumber!=null">
+                and cPlanLotNumber=#{qw.planLotNumber}&#45;&#45;计划单号
+            </if>
+            <if test="qw.startDate!=null">
+                and arriveMonth&gt;=$#{qw.startDate}  &#45;&#45;起始日期
+            </if>
+            <if test="qw.endDate!=null">
+                and arriveMonth&lt;=$#{qw.endDate}   &#45;&#45;结束日期
+            </if>
+        </where>
+        )-->
+    </select>
+
     <select id="excel001" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacityVo1">
         --部门	供应商	月份	数量	累计入库数量	能耗（能耗相加的汇总）--汇合
     select

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/IDyeLossService.java

@@ -12,9 +12,7 @@ import java.util.List;
 
 public interface IDyeLossService extends IService<DyeLoss> {
 
-    List<DyeLoss> select(DyeLossDto dyeLossDto);
-
-    List<DyeLoss> selectSum();
+    IPage<DyeLoss> selectPage(IPage<DyeLoss> page, QueryWrapper<DyeLossDto> queryWrapper);
 
     List<DyeLoss> selectVendor(String name);
 
@@ -22,5 +20,4 @@ public interface IDyeLossService extends IService<DyeLoss> {
 
     List<DyeLoss> excel();
 
-    IPage<DyeLoss> selectPage(IPage<DyeLoss> page,QueryWrapper<DyeLossDto> queryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/ISupplierCapacityService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.scas.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.jeecg.modules.scas.dto.SupplierCapacityDto;
 import org.jeecg.modules.scas.entity.SupplierCapacity;
@@ -22,4 +24,6 @@ public interface ISupplierCapacityService extends IService<SupplierCapacity> {
     List<SupplierCapacityVo2> excel2();
 
     List<SupplierCapacityVo3> excel3();
+
+    public IPage<SupplierCapacity> selectPage(IPage<SupplierCapacity> page, QueryWrapper<SupplierCapacityDto> queryWrapper);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/impl/DyeLossServiceImpl.java

@@ -21,15 +21,9 @@ public class DyeLossServiceImpl extends ServiceImpl<DyeLossMapper, DyeLoss> impl
     @Autowired
     DyeLossMapper dyeLossMapper;
 
-
     @DS("multi-one")
-    public List<DyeLoss> select(DyeLossDto dyeLossDto) {
-        return dyeLossMapper.querySelect(dyeLossDto);
-    }
-
-    @DS("multi-one")
-    public List<DyeLoss> selectSum() {
-        return dyeLossMapper.selectSum();
+    public IPage<DyeLoss> selectPage(IPage<DyeLoss> page, QueryWrapper<DyeLossDto> queryWrapper) {
+        return dyeLossMapper.selectPage(page,queryWrapper);
     }
 
     @DS("multi-one")
@@ -47,8 +41,4 @@ public class DyeLossServiceImpl extends ServiceImpl<DyeLossMapper, DyeLoss> impl
         return dyeLossMapper.excel();
     }
 
-    @DS("multi-one")
-    public IPage<DyeLoss> selectPage(IPage<DyeLoss> page, QueryWrapper<DyeLossDto> queryWrapper) {
-        return dyeLossMapper.selectPage(page,queryWrapper);
-    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/impl/SupplierCapacityServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.scas.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -47,6 +49,11 @@ public class SupplierCapacityServiceImpl extends ServiceImpl<SupplierCapacityMap
         return supplierCapacityMapper.excel003();
     }
 
+    @DS("multi-one")
+    public IPage<SupplierCapacity> selectPage(IPage<SupplierCapacity> page, QueryWrapper<SupplierCapacityDto> queryWrapper) {
+        return supplierCapacityMapper.selectPage(page,queryWrapper);
+    }
+
 
 
 

jeecg-boot-module-system/target/classes/application-cuidian.yml

@@ -0,0 +1,321 @@
+server:
+  port: 8090
+  tomcat:
+    max-swallow-size: -1
+  error:
+    include-exception: true
+    include-stacktrace: ALWAYS
+    include-message: ALWAYS
+  servlet:
+    context-path: /jeecg-boot
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: metrics,httptrace
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+  mail:
+    host: smtp.163.com
+    username: jeecgos@163.com
+    password: ??
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    job-store-type: jdbc
+    initialize-schema: embedded
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
+    #启动时更新己存在的Job
+    overwrite-existing-jobs: true
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: MyScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: true
+            misfireThreshold: 60000
+            clusterCheckinInterval: 10000
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+  #json 时间戳统一转换
+  jackson:
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
+  jpa:
+    open-in-view: false
+  activiti:
+    check-process-definitions: false
+    #启用作业执行器
+    async-executor-activate: false
+    #启用异步执行器
+    job-executor-activate: false
+  aop:
+    proxy-target-class: true
+  #配置freemarker
+  freemarker:
+    # 设置模板后缀名
+    suffix: .ftl
+    # 设置文档类型
+    content-type: text/html
+    # 设置页面编码格式
+    charset: UTF-8
+    # 设置页面缓存
+    cache: false
+    prefer-file-system-access: false
+    # 设置ftl文件路径
+    template-loader-path:
+      - classpath:/templates
+  # 设置静态文件路径，js,css等
+  mvc:
+    static-path-pattern: /**
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: CuiDian1234
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #多数据源配置
+        multi-one:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #redis 配置
+  redis:
+    database: 0
+    host: 127.0.0.1
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: ''
+    port: 6379
+#mybatis plus 设置
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: ASSIGN_ID
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
+#jeecg专用配置
+minidao :
+  base-package: org.jeecg.modules.jmreport.*
+  #DB类型（mysql | postgresql | oracle | sqlserver| other）
+  db-type: mysql
+jeecg :
+  # 是否启用安全模式
+  safeMode: false
+  # 签名密钥串(前后端要一致，正式发布请自行修改)
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: minio
+  path :
+    #文件上传根目录 设置
+    upload: /opt/upFiles
+    #webapp文件路径
+    webapp: /opt/webapp
+  shiro:
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+  #阿里云oss存储和大鱼短信秘钥配置
+  oss:
+    accessKey: ??
+    secretKey: ??
+    endpoint: oss-cn-beijing.aliyuncs.com
+    bucketName: jeecgdev
+  # ElasticSearch 6设置
+  elasticsearch:
+    cluster-name: jeecg-ES
+    cluster-nodes: 127.0.0.1:9200
+    check-enabled: false
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
+    upload-type: system
+    map:
+      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
+      baidu: ??
+  # 在线预览文件服务器地址配置
+  file-view-domain: 127.0.0.1:8012
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  #大屏报表参数设置
+  jmreport:
+    mode: dev
+    #数据字典是否进行saas数据隔离，自己看自己的字典
+    saas: false
+    #是否需要校验token
+    is_verify_token: true
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
+  #Wps在线文档
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  #xxl-job配置
+  xxljob:
+    enabled: false
+    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    address: 127.0.0.1:30007
+    ip: 127.0.0.1
+    port: 30007
+    logPath: logs/jeecg/job/jobhandler/
+    logRetentionDays: 30
+  route:
+    config:
+      data-id: jeecg-gateway-router
+      group: DEFAULT_GROUP
+      #自定义路由配置 yml nacos database
+      data-type: database
+  #分布式锁配置
+  redisson:
+    address: 127.0.0.1:6379
+    password:
+    type: STANDALONE
+    enabled: true
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper : debug
+#swagger
+knife4j:
+  #开启增强配置
+  enable: true
+  #开启生产环境屏蔽
+  production: false
+  basic:
+    enable: false
+    username: jeecg
+    password: jeecg1314
+#第三方登录
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: ??
+    DINGTALK:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+    WECHAT_OPEN:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h
+#第三方APP对接
+third-app:
+  enabled: false
+  type:
+    #企业微信
+    WECHAT_ENTERPRISE:
+      enabled: false
+      #CORP_ID
+      client-id: ??
+      #SECRET
+      client-secret: ??
+      #自建应用id
+      agent-id: ??
+      #自建应用秘钥（新版企微需要配置）
+      # agent-app-secret: ??
+    #钉钉
+    DINGTALK:
+      enabled: false
+      # appKey
+      client-id: ??
+      # appSecret
+      client-secret: ??
+      agent-id: ??

jeecg-boot-module-system/target/classes/application-prodnew.yml

@@ -0,0 +1,346 @@
+server:
+  port: 8003
+  tomcat:
+    max-swallow-size: -1
+  error:
+    include-exception: true
+    include-stacktrace: ALWAYS
+    include-message: ALWAYS
+  servlet:
+    context-path: /jeecg-boot
+  compression:
+    enabled: true
+    min-response-size: 1024
+    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: metrics,httptrace
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+  mail:
+    host: smtp.163.com
+    username: jeecgos@163.com
+    password: ??
+    properties:
+      mail:
+        smtp:
+          auth: true
+          starttls:
+            enable: true
+            required: true
+  ## quartz定时任务,采用数据库方式
+  quartz:
+    job-store-type: jdbc
+    initialize-schema: embedded
+    #定时任务启动开关，true-开  false-关
+    auto-startup: true
+    #启动时更新己存在的Job
+    overwrite-existing-jobs: true
+    properties:
+      org:
+        quartz:
+          scheduler:
+            instanceName: MyScheduler
+            instanceId: AUTO
+          jobStore:
+            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+            tablePrefix: QRTZ_
+            isClustered: true
+            misfireThreshold: 60000
+            clusterCheckinInterval: 10000
+          threadPool:
+            class: org.quartz.simpl.SimpleThreadPool
+            threadCount: 10
+            threadPriority: 5
+            threadsInheritContextClassLoaderOfInitializingThread: true
+  #json 时间戳统一转换
+  jackson:
+    date-format:   yyyy-MM-dd HH:mm:ss
+    time-zone:   GMT+8
+  jpa:
+    open-in-view: false
+  activiti:
+    check-process-definitions: false
+    #启用作业执行器
+    async-executor-activate: false
+    #启用异步执行器
+    job-executor-activate: false
+  aop:
+    proxy-target-class: true
+  #配置freemarker
+  freemarker:
+    # 设置模板后缀名
+    suffix: .ftl
+    # 设置文档类型
+    content-type: text/html
+    # 设置页面编码格式
+    charset: UTF-8
+    # 设置页面缓存
+    cache: false
+    prefer-file-system-access: false
+    # 设置ftl文件路径
+    template-loader-path:
+      - classpath:/templates
+  # 设置静态文件路径，js,css等
+  mvc:
+    static-path-pattern: /**
+  resource:
+    static-locations: classpath:/static/,classpath:/public/
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  datasource:
+    druid:
+      stat-view-servlet:
+        enabled: true
+        loginUsername: admin
+        loginPassword: 123456
+        allow:
+      web-stat-filter:
+        enabled: true
+    dynamic:
+      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+        # 连接池的配置信息
+        # 初始化大小，最小，最大
+        initial-size: 5
+        min-idle: 5
+        maxActive: 1000
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间，单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        #        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache，并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+        filters: stat,wall,slf4j
+        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+      datasource:
+        master:
+          url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: root
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          # 多数据源配置
+        multi-one:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_901_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_902_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_103_2021
+          username: cuidianpda
+          password: '*#cuidianpda0523'
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-one:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-two:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-three:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
+  #redis 配置
+  redis:
+    database: 0
+    host: 127.0.0.1
+    lettuce:
+      pool:
+        max-active: 8   #最大连接数据库连接数,设 -1 为没有限制
+        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
+        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
+        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
+      shutdown-timeout: 100ms
+    password: ''
+    port: 6379
+#mybatis plus 设置
+mybatis-plus:
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
+  global-config:
+    # 关闭MP3.0自带的banner
+    banner: false
+    db-config:
+      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+      id-type: ASSIGN_ID
+      # 默认数据库表下划线命名
+      table-underline: true
+  configuration:
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # 返回类型为Map,显示null对应的字段
+    call-setters-on-nulls: true
+#jeecg专用配置
+minidao :
+  base-package: org.jeecg.modules.jmreport.*
+jeecg :
+  # 是否启用安全模式
+  safeMode: false
+  # 签名密钥串(前后端要一致，正式发布请自行修改)
+  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+  # 本地：local\Minio：minio\阿里云：alioss
+  uploadType: alioss
+  path :
+    #文件上传根目录 设置
+    upload: /opt/jeecg-boot/upload
+    #webapp文件路径
+    webapp: /opt/jeecg-boot/webapp
+  shiro:
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+  #阿里云oss存储和大鱼短信秘钥配置
+  oss:
+    accessKey: ??
+    secretKey: ??
+    endpoint: oss-cn-beijing.aliyuncs.com
+    bucketName: jeecgdev
+    staticDomain: https://static.jeecg.com
+  # ElasticSearch 设置
+  elasticsearch:
+    cluster-name: jeecg-ES
+    cluster-nodes: 127.0.0.1:9200
+    check-enabled: true
+  # 表单设计器配置
+  desform:
+    # 主题颜色（仅支持 16进制颜色代码）
+    theme-color: "#1890ff"
+    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
+    upload-type: system
+    map:
+      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
+      baidu: ??
+  # 在线预览文件服务器地址配置
+  file-view-domain: http://fileview.jeecg.com
+  # minio文件上传
+  minio:
+    minio_url: http://minio.jeecg.com
+    minio_name: ??
+    minio_pass: ??
+    bucketName: otatest
+  #大屏报表参数设置
+  jmreport:
+    mode: prod
+    #数据字典是否进行saas数据隔离，自己看自己的字典
+    saas: false
+    #是否需要校验token
+    is_verify_token: true
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
+  #Wps在线文档
+  wps:
+    domain: https://wwo.wps.cn/office/
+    appid: ??
+    appsecret: ??
+  #xxl-job配置
+  xxljob:
+    enabled: false
+    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    appname: ${spring.application.name}
+    accessToken: ''
+    address: 127.0.0.1:30007
+    ip: 127.0.0.1
+    port: 30007
+    logPath: logs/jeecg/job/jobhandler/
+    logRetentionDays: 30
+  route:
+    config:
+      data-id: jeecg-gateway-router
+      group: DEFAULT_GROUP
+      #自定义路由配置 yml nacos database
+      data-type: database
+  #分布式锁配置
+  redisson:
+    address: 127.0.0.1:6379
+    password:
+    type: STANDALONE
+    enabled: true
+#cas单点登录
+cas:
+  prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+  level:
+    org.jeecg.modules.system.mapper : info
+#swagger
+knife4j:
+  #开启增强配置
+  enable: true
+  #开启生产环境屏蔽
+  production: false
+  basic:
+    enable: true
+    username: jeecg
+    password: jeecg1314
+#第三方登录
+justauth:
+  enabled: true
+  type:
+    GITHUB:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+    WECHAT_ENTERPRISE:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: ??
+    DINGTALK:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+    WECHAT_OPEN:
+      client-id: ??
+      client-secret: ??
+      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+  cache:
+    type: default
+    prefix: 'demo::'
+    timeout: 1h
+#第三方APP对接
+third-app:
+  enabled: false
+  type:
+    #企业微信
+    WECHAT_ENTERPRISE:
+      enabled: false
+      #CORP_ID
+      client-id: ??
+      #SECRET
+      client-secret: ??
+      #自建应用id
+      agent-id: ??
+      #自建应用秘钥（新版企微需要配置）
+      # agent-app-secret: ??
+    #钉钉
+    DINGTALK:
+      enabled: false
+      # appKey
+      client-id: ??
+      # appSecret
+      client-secret: ??
+      agent-id: ??

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/failDocument/mapper/xml/SyFailDocumentMapper.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.documents.failDocument.mapper.SyFailDocumentMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -0,0 +1,8 @@
+<?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.documents.orderData.mapper.SyOrderDataItemMapper">
+    <select id="queryList" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderDataItem" >
+        select * from sy_order_data_item where sy_order_data_id =
+        (SELECT id FROM sy_order_data where order_number = #{orderNumber})
+    </select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataMapper.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.documents.orderData.mapper.SyOrderDataMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/seclarationElements/mapper/xml/SyDeclarationElementsItemMapper.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.documents.seclarationElements.mapper.SyDeclarationElementsItemMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/seclarationElements/mapper/xml/SyDeclarationElementsMapper.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.documents.seclarationElements.mapper.SyDeclarationElementsMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsItemMapper.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.documents.shippingDetails.mapper.SyShippingDetailsItemMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -0,0 +1,76 @@
+<?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.documents.shippingDetails.mapper.SyShippingDetailsMapper">
+
+    <select id="queryOrderData" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
+
+        select a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
+         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_text as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,surplus_num as surplusNum,
+           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,
+           b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,
+           a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
+            a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
+             a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription from sy_order_data a
+        left join sy_order_data_item b
+        on a.id = b.sy_order_data_id and b.del_flag = 0
+        ${ew.customSqlSegment}
+
+
+    </select>
+
+<select id="queryShippingDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
+    select t.* from(select a.id as id,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
+    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,
+    b.small_po as smallPo,b.pack_id as packId,a.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
+    sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,
+    b.is_tc as isTc,a.hs_code as hsCode,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
+    b.arrival_date as arrivalDate,b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
+    b.pur_or_sub_order as purOrSubOrder,b.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,
+    b.material_composition as materialComposition,b.currency_text as currencyText,b.brand_side as brandSide,b.deposit_ratio as depositRatio,
+    b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,b.end_customer as endCustomer,
+    b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,a.pre_completion_date as preCompletionDate,
+    b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,b.whole_order_total as wholeOrderTotal,
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,b.chinese_name as chineseName,b.ac_set_no as acSetNo,
+    b.english_name as englishName,b.garment_factory as garmentFactory from sy_shipping_details a
+left join sy_shipping_details_item b
+on a.id = b.shipping_details_id and b.del_flag = 0
+where a.del_flag = 0 group by a.id order by a.document_no desc) as t
+${ew.customSqlSegment}
+
+</select>
+    
+    <update id="syshippingDetailsItemUpdate">
+        update sy_shipping_details_item
+        set del_flag = '1'
+        where shipping_details_id = #{shippingDetailsId}
+    </update>
+
+
+    <select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO">
+
+        select '103' as tenantId,id as accessoriesHeaderId,'ACCESSORIES0609-2' as packingHeaderNum,
+        'ACCESSORIES' as packingType,'NEW' as packingStatus,'PO36202206070001' as poNo,'JAZS001' as containerNumm,
+         '2022-06-07' as loadingDate,'01000229' as supplierNumber,
+          '' as invoiceNum,'蒋岗峰' as preparer,'2022-06-02 08:26:24' as preparationTime
+          from sy_shipping_details
+         where del_flag = 0 and id = #{id}
+
+    </select>
+
+    <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
+
+        select '103' as tenantId,
+          id as accessoriesLineId,id as accessoriesHeaderIdD,'1' as packingLineNum,'T0036' as merchandiser,'PO36202206070001' as poNo,
+          '' as moDetailId,'' as poId, 'W21-W20-MSP-SPW0001' as styleNo, 'C156St2' as batchNo,'藏青' as color,'N0201002139' as itemCode,'' as itemId,
+          '全涤绒布' as itemDesc,'针织布' as declarationName,'全涤' as composition,'190' as width,'' as rolls, '43' as planPackingQty,
+          '21' as actualPackingQty,'33' as grossWeight,'21' as netWeight,'32' as length,'' as clothWeight,'12' as cartons,
+          '6.32' as unitPrice,'45.21' as totalPrice,'' as gramWeight,'01000229' as supplierNumber,'' as supplierId,'' as supplierTenantId,
+          '打卷' as packingMethod,'染色' as treatmentMethod,'1' as manualYarnFlag,'0' as manualYarnUnitPrice,'0' as manualYarnProportion,
+          '无' as remark,'111' as cabinetNum
+          from sy_shipping_details_item
+          where del_flag = 0 and shipping_details_id = #{shippingDetailsId}
+    </select>
+
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/DxpDataPlanMapper.xml

@@ -0,0 +1,10 @@
+<?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.openApi.mapper.DxpDataPlanMapper">
+
+
+    <update id="updateLastTime">
+        update dxp_data_plan set last_time = #{time} where code = #{code}
+    </update>
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/SubcontractingOrderMapper.xml

@@ -0,0 +1,250 @@
+<?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.openApi.mapper.SubcontractingOrderMapper">
+
+    <select id="callGetMaxCode" resultType="int">
+        exec getMaxCode @StuNo = #{StuNo}
+    </select>
+
+    <select id="callGetUAMaxPK" resultType="map">
+        exec getUAMaxCode @StuNo = #{StuNo} ,@accId = #{accId}
+    </select>
+    
+    <select id="selectInfoByCode" resultType="map">
+        select id,
+               cVenCode,-- 供货单位
+               cDepCode , -- 部门编码
+               cPersonCode -- 业务员编码
+        from OM_MOMain where ccode = #{code}
+    </select>
+
+    <select id="selectUnitByCode" resultType="map">
+        select cComUnitCode from Inventory where cInvCode = #{code}
+    </select>
+
+    <select id="selectVendorByCode" resultType="map">
+        select cVenDefine2 from Vendor where cVenCode = #{code}
+    </select>
+
+    <select id="selectOrderByCode" resultType="org.jeecg.modules.openApi.entity.SubcontractingOrder">
+
+        select a.moId ,-- 染厂
+               e.cvcName ,-- 染厂
+               a.cCode ,-- 委外订单号
+               b.cInvCode , -- 存货编码
+               c.cInvName , -- 存货名称
+               c.cEnglishName , -- 存货英文名称
+               b.cdefine22 itemNumber, -- 款号
+               b.cfree1 color,-- 颜色
+               b.cDefine30 colorNumber,-- 色号
+               b.cFree6 gram, -- 要求克重
+               b.cFree4 doorWidth-- 要求门幅
+        from OM_MOMain a
+                 left join OM_MODetails b on a.moid = b.moid
+                 left join Inventory c on b.cInvCode = c.cInvCode
+                 left join Vendor d on a.cVenCode = d.cVenCode
+                 left join VendorClass e on d.cVCCode = e.cVCCode
+        where a.ccode = #{code}
+        and b.MoDetailsID = #{MoDetailsID}
+    </select>
+
+    <insert id="saveRdRecord01One">
+
+        INSERT INTO RdRecord01
+        (
+         ID,
+         cVouchType,<!--1 单据类型编码  01-->
+         cCode,<!--2 收发单据号-->
+         dDate,<!--3 单据日期 当前日期-->
+         cWhCode,<!--4 仓库编码-->
+         cOrderCode,<!--5 委外订单号 验布机-->
+         cVenCode,<!--6 供应商编码-->
+         cDepCode,<!--7 部门编码-->
+         cPersonCode,<!--8 业务员编码-->
+         cBusType,<!--9 业务类型-根据订单号获取或者默认  普通采购-->
+         cPTCode,<!--10 采购类型编码   01-->
+         cRdCode,<!--11 委外入库 默认 12-->
+         bredvouch,<!--12红蓝标识-->
+         bRdFlag,<!--13收发标志1-->
+         cSource,<!--14单据来源-->
+         bTransFlag,<!--15是否传递 0-->
+         bIsSTQc,<!--16是否传递 0-->
+         cMaker,<!--17创建人 验布机-->
+         cDefine13, <!-- 18委外订单号-->
+        ipurorderid, <!-- 19采购订单主表标识-->
+        dnmaketime, <!-- 20创建时间-->
+        cSysBarCode <!-- 主表二维码-->
+        )
+        VALUES (
+        #{ID},
+                #{cVouchType},<!--1 单据类型编码 采购入库-->
+                #{cCode},<!--2 收发单据号-->
+                getdate(),<!--3 单据日期 当前日期-->
+                #{cWhCode},<!--4 'W50081'仓库编码-->
+                #{cOrderCode},<!--5 委外订单号 验布机-->
+                #{cVenCode}, <!--6 供应商编码-->
+                #{cDepCode},<!-- 7部门编码-->
+                #{cPersonCode},<!--8业务员编码-->
+               '委外加工', <!-- 9业务类型-根据订单号获取或者默认 委外加工-->
+               '02',<!--10采购类型编码   02-->
+                '12',<!--11 委外入库 默认12-->
+                0, <!--12红蓝标识-->
+                1, <!--13收发标志 1-->
+                '委外订单',<!--14 单据来源-->
+                0, <!--15是否传递 0-->
+                0, <!--16是否传递 0-->
+                '陈创',<!--17创建人 验布机-->
+                #{cOrderCode}, <!-- 18委外订单号-->
+                #{ipurorderid}, <!-- 19采购订单主表标识-->
+                getdate(),<!--20 创建时间-->
+                #{cSysBarCode} <!-- 21二维码-->
+               )
+    </insert>
+
+    <insert id="saveRdrecords01One" >
+            INSERT INTO rdrecords01
+            (
+            AutoID,--1 子表主键
+            ID,--2 主表主键
+            cDefine22,--3 款号
+            cInvCode,--5 存货编码
+            iQuantity,--6 数量
+            cBatch,--7 批号
+            cFree1,--8 颜色
+            cDefine30, --9 染厂色号
+            cbMemo,--10 备注
+            iordercode, --11 订单号
+            irowno,--12 行号
+            iFlag,--13是否传递 --> 0
+            iMatSettleState,--14结算状态 --> 0
+            iBillSettleCount,--15结算次数 --> 0
+            cAssUnit,--18 辅计量单位编码
+            cFree4, -- 19 光坯毛门幅CM
+            cFree6, -- 20 克重/工艺
+            cFree5, -- 21 件数 总卷数
+            cPOID, --22 订单号
+            cbSysBarCode --22 订单号
+            )
+            VALUES
+            (
+            #{AutoID},--1 子表主键
+            #{ID},--2 主表主键
+            #{cDefine22},--3 款号
+            #{cInvCode},--5 存货编码
+            #{iQuantity},--6 数量
+            #{cBatch},--7 批号
+            #{color},--8 颜色
+            #{cDefine30},--9 染厂色号
+            #{cbMemo},--10 备注
+            #{iordercode}, --11 订单号
+            #{irowno},--12 行号
+            0,--13是否传递 --> 0
+            0,--14结算状态 --> 0
+            0,--15结算次数 --> 0
+            #{unit}, -- 18 单位
+            #{polishedBlank}, -- 19 光坯毛门幅CM
+            #{gramWeight}, -- 20 克重/工艺
+            #{num}, -- 21 件数 总卷数
+            #{cPOID},--22 订单号
+            #{cbSysBarCode}--22 订单号
+            )
+    </insert>
+
+    <select id="selectRdRecord01ByCode" resultType="map">
+
+        select ID,
+               bredvouch,-- 红蓝标识
+               cVouchType, -- 单据类型编码  01
+               cCode, -- 收发单据号
+               dDate, -- 单据日期 当前日期
+               cWhCode, -- 仓库编码
+               cOrderCode, -- 采购订单号
+               cARVCode, -- 采购到货单号
+               cVenCode, -- 供应商编码
+               cDepCode, -- 部门编码
+               cPersonCode, -- 业务员编码
+               dARVDate, -- 到货日期 空
+               cBusType, -- 业务类型   普通采购
+               cPTCode, -- 采购类型编码   01
+               cMemo, -- 备注
+               cRdCode, -- 收发类别编码 1
+               bredvouch,--红蓝标识--> 0
+               bRdFlag,--收发标志-- 1
+               cSource,--单据来源-->
+               bTransFlag,--是否传递 --> 0
+               bIsSTQc,--是否传递 --> 0
+               cMaker, -- 创建人 验布机
+               cHandler, -- 审核人 空
+               dVeriDate, -- 审核日期
+               dnverifytime, -- 审核时间
+               cDefine13 -- 委外订单号
+        from RdRecord01 where cCode = #{code}
+
+    </select>
+
+    <select id="selectRdChildById" resultType="map">
+
+        select AutoID, -- 子表主键
+               ID, -- 主表主键
+               cDefine22, -- 款号
+               cDefine28, -- 小PO 空
+               cInvCode, -- 存货编码
+               iQuantity,-- 数量
+               cBatch, -- 批号
+               cFree1, -- 颜色
+               cDefine30, -- 染厂色号
+               cDefine31, -- 潘通色号
+               cbMemo, -- 备注
+               iordercode, -- 订单号
+               irowno, -- 行号
+               iFlag, --是否传递 --> 0
+               iMatSettleState, --结算状态 --> 0
+               iBillSettleCount, --结算次数 --> 0
+               iPOsID, -- 采购订单子表标识 空
+               iOMoDID, -- 委外订单子表ID  空
+               cPOID, -- 订单号
+               cAssUnit --辅计量单位编码
+        from rdrecords01 where id =#{id}
+
+    </select>
+
+    <select id="selectRdAllByBar" resultType="map">
+        select a.id,
+               a.dDate, -- 日期
+               c.cDepName, -- 部门
+               d.cPersonName, -- 业务员
+               a.cCode, -- 单号
+               f.cInvName, -- 品名
+               b.cFree6, -- 克重
+               b.cFree4, -- 门幅
+               b.cfree1, -- 颜色
+               b.cDefine31, -- 潘通色号
+               b.cDefine30, -- 染厂色号
+               b.cInvCode, -- 存货编码
+               b.cBatch, -- 批号
+               b.cDefine37 -- 批号
+         from RdRecord01 a
+         left join rdrecords01 b on a.id = b.id
+         left join Department c on c.cDepCode = a.cDepCode
+         left join person d on d.cPersonCode = a.cPersonCode
+         left join Inventory f on f.cInvCode = b.cInvCode
+
+        where cbSysBarCode = #{cbSysBarCode} --'||st01|0000000003|1'
+
+    </select>
+
+    <update id="updateDef">
+        update rdrecords01 set cDefine37 = getdate() where cbSysBarCode = #{cbSysBarCode}
+    </update>
+
+    <select id="selectNum" resultType="int">
+        select count(1) from rdrecords01 where id = #{id} and (cDefine37 = '' or cDefine37 is null)
+    </select>
+
+    <update id="toExamine">
+        update RdRecord01 set cHandler =(select top 1 cPersonName from Person where cPersonCode=#{cHandler}) ,
+                              dVeriDate = getdate() , dnverifytime = getdate()
+        where id = #{id}
+    </update>
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/productionScheduleReport/mapper/xml/ProductionScheduleMapper.xml

@@ -0,0 +1,43 @@
+<?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.productionScheduleReport.mapper.ProductionScheduleMapper">
+
+    <select id="selectByPage" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
+
+        select --top 100
+            c.cDepName -- 部门
+             ,d.cPersonName -- 业务员
+             ,a.cSOCode -- 销售订单号
+             ,a.cSOCode planCode-- 计划单号
+             ,e.cCusName -- 客户
+             ,a.cDefine12 -- 成衣加工厂
+             ,b.cInvCode -- 存货编码
+             ,f.cInvName -- 存货名称
+             ,b.cDefine22 itemNumber -- 款号
+             ,b.cFree1 color-- 颜色
+             ,a.dPreDateBT -- 交期
+             ,b.iQuantity --订单数量
+             ,b.iTaxUnitPrice -- 原币含税单价
+             ,b.iSum total_sum -- 总额（原币）
+             ,b.iNatSum/b.iQuantity bb_price -- 单价（本币）
+             ,b.iNatSum -- 总额（本币）
+             ,b.icostsum -- 实际发票成本
+             ,b.foutquantity --已出库数量
+             ,b.iKPQuantity --累计开票数量
+             ,b.iKPMoney -- 累计开票金额
+             ,f.pictureGUid pictureId -- 图片id
+             ,a.dDate dDate -- 单据日期
+        from SO_SOMain a
+                 left join SO_SODetails b on a.id = b.id
+                 left join Department c on c.cDepCode = a.cDepCode
+                 left join person d on d.cPersonCode = a.cPersonCode
+                 left join Customer e on e.cCusCode = a.cCusCode
+                 left join Inventory f on f.cInvCode = b.cInvCode
+        ${ew.customSqlSegment}
+
+    </select>
+    
+    <select id="selectPicture" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
+        select picture,cPicturetype from aa_picture where cGUid = #{pictureId}
+    </select>
+</mapper>