燃损第一版

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,10 +1,10 @@
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,3 @@
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java

jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,14 +1,14 @@
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListerer.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
-D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListerer.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
+D:\git-gogs\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FabricLossController.java

@@ -16,10 +16,7 @@ import org.jeecg.modules.report.service.IFabricLossService;
 import org.jeecg.modules.report.service.IFabricOmOrderService;
 import org.jeecg.modules.report.service.IFabricPoOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Collection;
@@ -60,17 +57,18 @@ public class FabricLossController {
 	 */
 	@AutoLog(value = "面料损耗整体数据")
 	@ApiOperation(value = "面料损耗整体数据")
-	@ApiImplicitParams(value={
-			@ApiImplicitParam(name="csocode",value="计划号",required = true)
-	})
-	@RequestMapping(value = "/getFabricLossDatas", method = RequestMethod.GET)
-	public Result<Map<String,Object>> getFabricLossDatas(String csocode) {
-		Result<Map<String,Object>> result = new Result<>();
-		if (oConvertUtils.isNotEmpty(csocode)){
-			Map<String,Object> fabricLossDatas = fabricLossService.getFabricLossDatas(csocode);
+	@GetMapping(value = "/getFabricLossDatas")
+	public Result<FabricLoss> getFabricLossDatas(@RequestParam(name="csocode",required=true) String csocode) {
+		FabricLoss fabricLoss = fabricLossService.getFabricLossData(csocode);
+		Result<FabricLoss> result = new Result<>();
+		if (fabricLoss == null){
+			result.setSuccess(false);
+			result.setMessage("计划号有误，获取不到数据");
+		}else{
 			result.setSuccess(true);
-			result.setResult(fabricLossDatas);
+			result.setResult(fabricLoss);
 		}
+
 		return result;
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricLoss.java

@@ -1,20 +1,23 @@
 package org.jeecg.modules.report.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 //面料损耗实体
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@ApiModel(value="面料损耗-表头", description="面料损耗-表头")
 public class FabricLoss {
     //计划单号
-    private String csoCode;
+    private String cCode;
     //款号
     private String cDefine22;
     //业务员
@@ -22,9 +25,9 @@ public class FabricLoss {
     //计划员
     private  String planner;
     //排单数量
-    private String number;
+    private double number;
     //实际出库数量
-    private  String outboundNumber;
+    private  double outboundNumber;
     //制单人
     private  String makingPeople;
     //实际单件成本
@@ -40,4 +43,13 @@ public class FabricLoss {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date dateTime;
 
+    // 采购订单列表
+    List<FabricPoOrder> fabricPoOrderList;
+    // 委外订单国内
+    List<FabricOMOrder> fabricOMOrderList1;
+    // 委外订单国外
+    List<FabricOMOrder> fabricOMOrderList2;
+
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricOMOrder.java

@@ -14,24 +14,26 @@ import java.util.Map;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="demo对象", description="面料损耗-委外订单")
+@ApiModel(value="面料损耗-委外订单", description="面料损耗-委外订单")
 public class FabricOMOrder {
     @ApiModelProperty(value = "制造工艺")
     private String  cVCName;
     @ApiModelProperty(value = "工厂")
+    private String cVenName;
+    @ApiModelProperty(value = "工厂缩写")
     private String cVenAbbName;
     @ApiModelProperty(value = "材料出库数量")
-    private  String iQuantityCK;
+    private  double iOutQuantity;
     @ApiModelProperty(value = "采购入库数量")
-    private  String iQuantityRK;
+    private  double iQuantityRK;
     @ApiModelProperty(value = "物料编码")
     private  String cInvCode;
     @ApiModelProperty(value = "物料名称")
     private String cInvName;
     @ApiModelProperty(value = "颜色")
     private  String cfree1;
-    @ApiModelProperty(value = "计划数量")
-    private  String iQuantity;
+    @ApiModelProperty(value = "委外订单数量")
+    private  double iQuantity;
     @ApiModelProperty(value = "多发少发")
     private  String sum;
     @ApiModelProperty(value = "损耗")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricPoOrder.java

@@ -10,8 +10,11 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="demo对象", description="面料损耗-采购订单")
+@ApiModel(value="面料损耗-采购订单", description="面料损耗-采购订单")
 public class FabricPoOrder {
+    //采购订单号
+    @ApiModelProperty(value = "采购订单号")
+    private  String cPOID;
     //存货编码
     @ApiModelProperty(value = "存货编码")
     private  String cInvCode;
@@ -23,15 +26,18 @@ public class FabricPoOrder {
     private String cBatch;
     //计划数量
     @ApiModelProperty(value = "计划数量")
-    private String iquantity;
+    private Double iQuantity;
     //采购数量
-    @ApiModelProperty(value = "采购数量")
-    private  String poiQuantity;
+    @ApiModelProperty(value = "采购入库数量")
+    private  Double iQuantityIn;
     //分配数量
     @ApiModelProperty(value = "分配数量")
     private  String iquantitys;
     //采购供应商
     @ApiModelProperty(value = "采购供应商")
+    private  String cVenName;
+    //采购供应商缩写
+    @ApiModelProperty(value = "采购供应商缩写")
     private  String cVenAbbName;
     //委外供应商
     @ApiModelProperty(value = "委外供应商")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/FabricLossMapper.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.report.entity.FabricLoss;
+import org.jeecg.modules.report.entity.FabricOMOrder;
+import org.jeecg.modules.report.entity.FabricPoOrder;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.vo.SysUserDepVo;
@@ -25,8 +27,8 @@ import java.util.List;
 public interface FabricLossMapper extends BaseMapper<FabricLoss> {
 
 	//获取面料损耗数据
-	@DS("multi-one")
-	FabricLoss getFabricLossData(@Param("code")String code);
+	@DS("multi-three")
+	List<FabricLoss> getFabricLossData(@Param("code")String code);
 
 	//查询103委外制单人=计划员
 	@DS("multi-three")
@@ -48,4 +50,22 @@ public interface FabricLossMapper extends BaseMapper<FabricLoss> {
 	@DS("multi-two")
 	String getOrderCode(@Param("code")String code);
 
+	//查询销售出库数量
+	@DS("multi-three")
+	String getSaleOutSum(@Param("code")String code);
+
+	//获取采购入库数据
+	@DS("multi-three")
+	List<FabricPoOrder> getPurchaseList(@Param("code")String code);
+
+	//其他入库纱,找委外订单的材料出库单，获取物料号+批号，物料号+批号再其他入库单
+	@DS("multi-three")
+	List<FabricPoOrder> getPurchaseListOtherInList(@Param("code")String code);
+
+	//来源余纱,找委外订单的材料出库单，获取物料号+批号。如果物料号+批号在形态转换单中，取转换前物料+批号。判断物料+批号，是否在其他采购入库里
+	@DS("multi-three")
+	List<FabricPoOrder> getPurchaseListOtherPurInList(@Param("code")String code);
+
+	@DS("multi-three")
+	List<FabricOMOrder> getOmOrderList(@Param("code")String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/FabricOmOrderMapper.java

@@ -67,4 +67,19 @@ public interface FabricOmOrderMapper extends BaseMapper<FabricOMOrder> {
 	 */
 	@DS("multi-three")
 	List<FabricMoOrderRK>getFabricOMOrderDataRK2(@Param("iOMoDID")String iOMoDID,@Param("comcode")String comcode);
+
+	/**
+	 * 获取委外订单编号，去掉-后面部分
+	 * @param cCode - 委外订单编号，去掉-后面部分
+	 * @return
+	 */
+	@DS("multi-three")
+	List<FabricOMOrder> getCodeList(@Param("cCode")String cCode);
+	/**
+	 * 获取根据委外订单号（去掉-后面部分）获取委外订单表头列表
+	 * @param cCode - 委外订单编号，去掉-后面部分
+	 * @return
+	 */
+	@DS("multi-three")
+	List<FabricOMOrder> getHeadListByCode(@Param("cCode")String cCode);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -2,50 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.report.mapper.FabricLossMapper">
 
-
+	<!-- 获取 头信息 主要是成衣委外及源头订单信息 -->
 	<select id="getFabricLossData" resultType="org.jeecg.modules.report.entity.FabricLoss">
-		select distinct   a.csocode as 'csoCode',b.cdefine22 as 'cDefine22',c.cPersonName as 'cPersonName',d.iQuantity as 'number',e.iQuantity as 'outboundNumber',
-		f.price as 'price',CONVERT(varchar,GETDATE(),120) as 'dateTime',a.csocode as 'csoCode',f.price as 'actualPrice',ta.cPOID as 'orderCode'
-		from SO_SOMain a left join SO_SODetails b on a.csocode=b.csocode
-		left join Person c on a.cPersonCode=c.cPersonCode
-		left join (select sum(isnull(a.iQuantity,0))as 'iQuantity' ,b.csocode  from OM_MODetails a left join SO_SODetails b on a.isosid =b.isosid																			  left join OM_MOMain c on a.moid=c.moid GROUP BY b.csocode) d on a.csocode=d.csocode
-		left join (select sum(isnull(iQuantity,0)) as 'iQuantity',csocode from rdrecords32  GROUP BY csocode) e on a.csocode=e.csocode
-		left join (select isnull(sum(a.count)/sum(b.iquantity),0) as 'price',b.csoordercode from (
-		select sum((isnull(c.iQuantity,0)*isnull(b.iunitcost,0))+(isnull(c.iQuantity,0)*isnull(b.iprocesscost,0))) as 'count' ,a.cordercode as 'cordercode'     from rdrecord01 a left join rdrecords01 b on a.id=b.id
-		left join (select sum(b.iquantity)as 'iquantity',b.cbatch,b.iorderdid,cmpocode  from rdrecord11 a  left join rdrecords11 b on a.id=b.id
-		where   b.cbatch is not null GROUP BY b.iorderdid,cbatch,cmpocode)  c on b.iorderdid=c.iorderdid and a.cordercode=c.cmpocode AND c.cbatch=b.cbatch
-		GROUP BY a.cordercode) a
-		left join (select sum(isnull(b.iquantity,0)) as 'iquantity',a.ccode,b.csoordercode from OM_MOMain  a left join OM_MODetails b  on a.moid=b.moid
-		GROUP BY a.ccode,b.csoordercode) b on a.cordercode=b.ccode
-		where   a.count !='0'  GROUP BY b.csoordercode) f on a.csocode=f.csoordercode
-		left join (select a.cpoid as 'cpoid',b.csoordercode as 'csoordercode' from PO_Pomain a left join PO_Podetails b on a.POID=b.POID) ta on a.csocode=ta.csoordercode
-		where 1=1
-		<if test="code!=null and ''!=code">
-			a.csocode=#{code}
-		</if>
+		select distinct * from VIEW_FabricLoss_Head_Clothes where cCode like CONCAT(#{code},'%')
 	</select>
+	<!-- 获取计划员 103的面料委外制单人，供应商分类是染厂的 -->
 	<select id="getPlanner" resultType="java.lang.String">
-		select distinct c.cMaker   from OM_MODetails a
-		left join OM_MOMain c on a.moid=c.moid
-		left join Vendor b on c.cvencode=b.cvencode
-		where b.cvccode='0105'
-		<if test="code!=null and ''!=code">
-			a.csocode=#{code}
-		</if>
-
+		select distinct cmaker
+		from om_momain where
+		exists (select x.moid from om_mobody x inner join Inventory y on x.cinvcode=y.cinvcode where x.moid=om_momain.moid and
+		(y.cInvCCode like '01%' or y.cInvCCode like '02%' or y.cInvCCode like '03%' or y.cInvCCode like '04%')   )
+		and
+		exists (select x.cVenCode from Vendor x where x.cVenCode=om_momain.cVenCode and x.cVCCode='0105')
+		and cCode like CONCAT(#{code},'%')
 	</select>
+	<!-- 制单人 103的委外发票制单人 -->
 	<select id="getMakingPeople" resultType="java.lang.String">
-		select distinct cMaker from SaleBillVouch where 1=1
-		<if test="code!=null and ''!=code">
-			cSOCode=#{code}
-		</if>
+		select distinct cpbvmaker From PurBillVouch where cInCode in (
+		select cCode From  RdRecord01 where cOrderCode in (
+			select ccode
+			from om_momain where
+			exists (select x.moid from om_mobody x inner join Inventory y on x.cinvcode=y.cinvcode where x.moid=om_momain.moid and
+			(y.cInvCCode like '01%' or y.cInvCCode like '02%' or y.cInvCCode like '03%' or y.cInvCCode like '04%')   )
+			and cCode like CONCAT(#{code},'%')
+		)
+		)
 	</select>
+	<!-- 排单数量 -->
 	<select id="getNumber" resultType="java.lang.String">
-		select sum(isnull(a.iQuantity,0))as 'iQuantity'  from OM_MODetails a left join SO_SODetails b on a.isosid =b.isosid
-																   left join OM_MOMain c on a.moid=c.moid where 1=1
-		<if test="code!=null and ''!=code">
-			b.csocode=#{code}
-		</if>
+		select sum(isnull(iQuantity,0))as 'iQuantity'  from VIEW_OM_MOMain_ALL_Clothes
+		where cCode like CONCAT(#{code},'%')
+	</select>
+	<!-- 销售出库数量 -->
+	<select id="getSaleOutSum" resultType="java.lang.String">
+		select sum(isnull(iQuantity,0)) as 'iQuantity' from VIEW_FabricLoss_Head_Clothes_SaleOut_Sum where csocode in (
+			select cSoOrdercode from VIEW_OM_MOMain_ALL_Clothes where ccode like CONCAT(#{code},'%')
+		)
 	</select>
 	<select id="getPrice" resultType="java.lang.String">
 		select isnull(sum(a.count)/sum(b.iquantity),0) as 'price' from (
@@ -69,4 +61,119 @@
 		</if>
 	</select>
 
+	<!--获取采购订单-->
+	<select id="getPurchaseList" resultType="org.jeecg.modules.report.entity.FabricPoOrder">
+		select cVenName,cVenAbbName,cInvCode,cInvName,cBatch,sum(iQuantity) as iQuantity,
+		sum(iQuantityIn) as iQuantityIn
+		 from (
+		select a.cPOID ,d.cVenName,d.cVenAbbName ,c.cInvCode,c.cInvName,b.iQuantity,
+		(select sum(iquantity) from RdRecords01 x where x.iposid=b.id) as iQuantityIn,
+		stuff((SELECT ',' + cbatch FROM RdRecords01 x where x.iposid=b.id FOR XML path('') ), 1, 1, '') as cBatch
+		from PO_Pomain a
+		inner join PO_Podetails b on a.POID  =b.POID
+		inner join Inventory c on b.cInvCode=c.cInvCode
+		inner join Vendor  d on a.cVenCode=d.cVenCode
+		where a.cPOID like CONCAT(#{code},'%')
+		) as t1 group by cVenName,cVenAbbName,cInvCode,cInvName,cBatch
+	</select>
+	<!-- 其他入库纱,找委外订单的材料出库单，获取物料号+批号，物料号+批号再其他入库单 -->
+	<select id="getPurchaseListOtherInList" resultType="org.jeecg.modules.report.entity.FabricPoOrder">
+		SELECT
+			'其他入库的纱' as cInvName,
+			isnull(sum(iQuantity),0) as iQuantityIn
+		FROM
+			rdrecords11
+		WHERE
+			comcode IN (
+				SELECT DISTINCT
+					a.cCode
+				FROM
+					om_momain a
+					INNER JOIN OM_MODetails b ON a.moid = b.moid
+					INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+				WHERE
+					c.cInvCCode NOT LIKE '19%'
+					AND a.cCode LIKE CONCAT(#{code},'%')
+			)
+			AND cInvCode + isnull( cBatch, '' ) IN ( SELECT cInvCode + isnull( cBatch, '' ) FROM RdRecords08 )
+
+	</select>
+	<!-- 来源余纱,找委外订单的材料出库单，获取物料号+批号。如果物料号+批号在形态转换单中，取转换前物料+批号。判断物料+批号，是否在其他采购入库里 -->
+	<select id="getPurchaseListOtherPurInList" resultType="org.jeecg.modules.report.entity.FabricPoOrder">
+		(
+		SELECT
+			'来源余纱' as cInvName,isnull(sum(h.iQuantity),0)  as iQuantityIn
+		FROM
+			rdrecords11 h
+		WHERE
+			comcode IN (
+		SELECT DISTINCT
+			a.cCode
+		FROM
+			om_momain a
+			INNER JOIN OM_MODetails b ON a.moid = b.moid
+			INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+		WHERE
+			c.cInvCCode NOT LIKE '19%'
+			AND a.cCode LIKE CONCAT(#{code},'%')
+			)
+			AND cInvCode + isnull( cBatch, '' ) IN ( SELECT cinvcode + isnull( cavbatch, '' ) FROM AssemVouchs WHERE bavtype = '转换后' )
+			and cInvCode + isnull( cBatch, '' ) IN (
+				select u.cInvCode+ isnull( u.cBatch, '' )  from rdrecords01 u inner join PO_Podetails v on u.iposid=v.id
+				inner join PO_Pomain w on w.POID  =v.POID where w.cPOID not like CONCAT(#{code},'%')
+				and u.cInvCode + isnull( u.cBatch, '' ) in (
+					select m.cInvCode + isnull( m.cavbatch, '' ) from AssemVouchs m where m.cavcode + CONVERT ( VARCHAR ( 10 ), m.igroupno ) in (
+							select cavcode + CONVERT ( VARCHAR ( 10 ), igroupno )
+							FROM
+								AssemVouchs where cinvcode + isnull( cavbatch, '' )=h.cInvCode + isnull( h.cBatch, '' ) and  bavtype = '转换后'
+					) and bavtype = '转换前'
+				)
+			)
+		) union all
+		(
+			SELECT
+				'来源余纱' as cInvName,isnull(sum(iQuantity),0)  as iQuantityIn
+			FROM
+				rdrecords11
+			WHERE
+				comcode IN (
+			SELECT DISTINCT
+				a.cCode
+			FROM
+				om_momain a
+				INNER JOIN OM_MODetails b ON a.moid = b.moid
+				INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+			WHERE
+				c.cInvCCode NOT LIKE '19%'
+				AND a.cCode LIKE CONCAT(#{code},'%')
+				)
+				AND cInvCode + isnull( cBatch, '' ) NOT IN ( SELECT cinvcode + isnull( cavbatch, '' ) FROM AssemVouchs WHERE bavtype = '转换后' )
+				and cInvCode + isnull( cBatch, '' ) in (
+					select u.cInvCode + isnull( u.cBatch, '' ) from rdrecords01 u inner join PO_Podetails v on u.iposid=v.id
+					inner join PO_Pomain w on w.POID  =v.POID where w.cPOID not like CONCAT(#{code},'%')
+				)
+		)
+	</select>
+	<!--获取委外订单-->
+	<select id="getOmOrderList" resultType="org.jeecg.modules.report.entity.FabricOMOrder">
+	select e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
+		isnull(sum(iOutQuantity),0) as iOutQuantity,
+		isnull(sum(iQuantity),0) as iQuantity
+	from
+	(
+		SELECT e.cVCName,d.cVenName ,d.cVenAbbName ,a.cVenCode ,c.cInvCode,c.cInvName,
+			(select sum(iQuantity) from rdrecords11 x where x.iOMoDID=b.MODetailsID) as iOutQuantity,
+			b.iQuantity,b.MODetailsID
+		FROM
+			om_momain a
+			INNER JOIN OM_MODetails b ON a.moid = b.moid
+			INNER JOIN Inventory c ON b.cinvcode = c.cinvcode
+			inner join Vendor  d on a.cVenCode=d.cVenCode
+			inner join VendorClass e on d.cVCCode =e.cVCCode
+		WHERE
+			c.cInvCCode NOT LIKE '19%'
+			AND a.cCode LIKE CONCAT(#{code},'%')
+		order by e.cVCName,d.cVenName,c.cInvCode,c.cInvName
+	) as t1
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricOmOrderMapper.xml

@@ -75,4 +75,15 @@
 		left join rdrecord11 c on c.id=b.id
 		left join Vendor v on c.cvencode=v.cvencode
 	</select>
+	<!-- 获取去掉-后面内容的委外订单号，去重 -->
+	<select id="getCodeList" resultType="org.jeecg.modules.report.entity.FabricOMOrder">
+		select * from VIEW_OM_MOMain_Code where
+		<if test="cCode!=null and ''!=cCode">
+			and cCode=#{cCode}
+		</if>
+	</select>
+	<!-- 获取面料损耗表头 -->
+	<select id="getHeadListByCode" resultType="org.jeecg.modules.report.entity.FabricOMOrder">
+		select cCode, from OM_MOMain where cCode like CONCAT(#{cCode},'%')
+	</select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricLossServiceImpl.java

@@ -12,6 +12,7 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -68,52 +69,76 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 	@Override
 	public FabricLoss getFabricLossData(String code) {
 		if (oConvertUtils.isNotEmpty(code)){
-			FabricLoss fabricLoss = fabricLossMapper.getFabricLossData(code);
-			if (oConvertUtils.isNotEmpty(fabricLoss)){
-				String orderCode = fabricLossMapper.getOrderCode(fabricLoss.getOrderCode());
-				if (oConvertUtils.isNotEmpty(orderCode)){
-					//103排单数量
-					String number = fabricLossMapper.getNumber(orderCode);
-					fabricLoss.setNumber(fabricLoss.getNumber()+number);
-					//制单人
-					List<String> makingPeople = fabricLossMapper.getMakingPeople(orderCode);
-					if (oConvertUtils.isNotEmpty(makingPeople)){
-						StringBuffer sb = new StringBuffer();
-						makingPeople.forEach(str->{
-							sb.append(str).append(",");
-						});
-						String keywordStr = sb.deleteCharAt(sb.length() - 1).toString();
-						fabricLoss.setMakingPeople(keywordStr);
-					}
-					//计划员
-					List<String> planner = fabricLossMapper.getPlanner(orderCode);
-					if (oConvertUtils.isNotEmpty(planner)){
-						StringBuffer sb = new StringBuffer();
-						makingPeople.forEach(str->{
-							sb.append(str).append(",");
-						});
-						String keywordStr = sb.deleteCharAt(sb.length() - 1).toString();
-						fabricLoss.setPlanner(keywordStr);
-					}
-					//103单间成本
-					String price = fabricLossMapper.getPrice(orderCode);
-					if(oConvertUtils.isNotEmpty(fabricLoss.getPrice())){
-						BigDecimal b=new BigDecimal(price);
-						b=b.add(new BigDecimal(fabricLoss.getPrice()));
-						b=b.divide(new BigDecimal("2"));
-						fabricLoss.setPrice(b.toString());
-						fabricLoss.setActualPrice(b.toString());
-					}else {
-						fabricLoss.setPrice(price);
-						fabricLoss.setActualPrice(price);
-					}
-
+			FabricLoss ret = new FabricLoss();
+			ret.setCCode(code);
 
+			List<String> lstContractNo = new ArrayList<>(); // 成衣合同号
+			List<String> lstCdefine22 = new ArrayList<>();  // 款号
+			List<String> lstCpersonName = new ArrayList<>(); // 业务员
 
+			List<FabricLoss> fabricLossList = fabricLossMapper.getFabricLossData(code);
+			for (FabricLoss fabricLoss : fabricLossList){
+				if (oConvertUtils.isNotEmpty(fabricLoss.getContractNo()) &&
+						!lstContractNo.contains(fabricLoss.getContractNo())){
+					lstContractNo.add(fabricLoss.getContractNo());
 				}
-
+				if (oConvertUtils.isNotEmpty(fabricLoss.getCDefine22()) &&
+						!lstCdefine22.contains(fabricLoss.getCDefine22())){
+					lstCdefine22.add(fabricLoss.getCDefine22());
+				}
+				if (oConvertUtils.isNotEmpty(fabricLoss.getCPersonName()) &&
+						!lstCpersonName.contains(fabricLoss.getCPersonName())){
+					lstCpersonName.add(fabricLoss.getCPersonName());
+				}
+			}
+			if (lstContractNo.size()>0){
+				ret.setContractNo(String.join(",",lstContractNo));
+			}
+			if (lstCdefine22.size()>0){
+				ret.setCDefine22(String.join(",",lstCdefine22));
+			}
+			if (lstCpersonName.size()>0){
+				ret.setCPersonName(String.join(",",lstCpersonName));
 			}
-			return  fabricLoss;
+			//制单人
+			List<String> makingPeople = fabricLossMapper.getMakingPeople(code);
+			if (oConvertUtils.listIsNotEmpty(makingPeople)){
+				ret.setMakingPeople(String.join(",", makingPeople));
+			}
+			//计划员
+			List<String> planner = fabricLossMapper.getPlanner(code);
+			if (oConvertUtils.listIsNotEmpty(planner)){
+				ret.setPlanner(String.join(",", planner));
+			}
+			// 日期
+			ret.setDateTime(DateUtils.getDate());
+			// 排单数量
+			ret.setNumber(oConvertUtils.getDouble(fabricLossMapper.getNumber(code),0));
+			// 销售出库数量
+			ret.setOutboundNumber(oConvertUtils.getDouble(fabricLossMapper.getSaleOutSum(code),0));
+			// 采购入库数据
+			List<FabricPoOrder> fabricPoOrderList = fabricLossMapper.getPurchaseList(code);
+			// 采购入库-来源余纱
+			List<FabricPoOrder> fabricPoOrderTempList = fabricLossMapper.getPurchaseListOtherPurInList(code);
+			if (fabricPoOrderTempList.size()>0){
+				FabricPoOrder fabricPoOrderFirst = fabricPoOrderTempList.get(0);
+				for (int i=1; i<fabricPoOrderTempList.size(); i++){
+					fabricPoOrderFirst.setIQuantityIn(fabricPoOrderFirst.getIQuantityIn()+fabricPoOrderTempList.get(i).getIQuantityIn());
+				}
+				fabricPoOrderList.add(fabricPoOrderFirst);
+			}
+			// 采购入库-其他入库的纱
+			fabricPoOrderTempList = fabricLossMapper.getPurchaseListOtherInList(code);
+			if (fabricPoOrderTempList.size()>0){
+				fabricPoOrderList.add(fabricPoOrderTempList.get(0));
+			}
+			ret.setFabricPoOrderList(fabricPoOrderList);
+			// 委外订单
+			List<FabricOMOrder> fabricOMOrderList1 = fabricLossMapper.getOmOrderList(code);
+			ret.setFabricOMOrderList1(fabricOMOrderList1);
+
+
+			return  ret;
 		}
 		return null;
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricMoOrderServiceImpl.java

@@ -45,9 +45,9 @@ public class FabricMoOrderServiceImpl extends ServiceImpl<FabricOmOrderMapper, F
 				map.put("m","");
 				maps.put("g","");
 				if (oConvertUtils.isNotEmpty(str.getType())&&str.getType().equals("M")){
-					map.put("m",str.getIQuantityCK());
+					map.put("m",str.getIOutQuantity());
 				}else  if (oConvertUtils.isNotEmpty(str.getType())&&str.getType().equals("PCS")){
-					maps.put("g",str.getIQuantityCK());
+					maps.put("g",str.getIOutQuantity());
 				}
 				list.add(map);
 				list.add(maps);
@@ -71,4 +71,5 @@ public class FabricMoOrderServiceImpl extends ServiceImpl<FabricOmOrderMapper, F
 	public List<FabricMoOrderRK> getFabricOMOrderDataRK2(String iOMoDID, String comcode) {
 		return fabricOmOrderMapper.getFabricOMOrderDataRK2(iOMoDID,comcode);
 	}
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricPoOrderServiceImpl.java

@@ -81,13 +81,13 @@ public class FabricPoOrderServiceImpl extends ServiceImpl<FabricPoOrderMapper, F
 						if (oConvertUtils.isNotEmpty(fabricGetPoOrderYs)&&fabricGetPoOrderYs.size()>0){
 							fabricPoOrderData.addAll(fabricGetPoOrderYs);
 						}else {
-							fabricPoOrderData.add(new FabricPoOrder().setCInvName("来源余纱").setPoiQuantity("0"));
+							fabricPoOrderData.add(new FabricPoOrder().setCInvName("来源余纱").setIQuantity(new Double(0)));
 						}
 						List<FabricPoOrder> fabricGetPoOrderQT = this.getFabricGetPoOrderQT(csocode, str.getCBatch());
 						if (oConvertUtils.isNotEmpty(fabricGetPoOrderQT)&&fabricGetPoOrderQT.size()>0){
 							fabricPoOrderData.addAll(fabricGetPoOrderQT);
 						}else {
-							fabricPoOrderData.add(new FabricPoOrder().setCInvName("其他入库纱").setPoiQuantity("0"));
+							fabricPoOrderData.add(new FabricPoOrder().setCInvName("其他入库纱").setIQuantity(new Double(0)));
 						}
 						break;
 					}

jeecg-boot-module-system/target/classes/application-test.yml → jeecg-boot-module-system/src/main/resources/application-fhf.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8003
   tomcat:
     max-swallow-size: -1
   error:
@@ -111,14 +111,14 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 20
+        maxActive: 1000
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1
+        #        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,16 +131,42 @@ spring:
         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
+          url: jdbc:mysql://127.0.0.1:3306/senyu?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: CuiDian1234
+          password: abcd1234
           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
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_901_2021
+          username: sa
+          password: Windows2008R2
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_902_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_903_2021
+          username: sa
+          password: Windows2008R2
+          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
@@ -167,39 +193,38 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    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
+  uploadType: alioss
   path :
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /opt/jeecg-boot/upload
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /opt/jeecg-boot/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    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
-  # ElasticSearch 6设置
+    staticDomain: https://static.jeecg.com
+  # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+    check-enabled: true
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -210,7 +235,7 @@ jeecg :
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: http://fileview.jeecg.com
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -219,7 +244,7 @@ jeecg :
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: dev
+    mode: prod
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
@@ -260,7 +285,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper : debug
+    org.jeecg.modules.system.mapper : info
 #swagger
 knife4j:
   #开启增强配置
@@ -268,7 +293,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: false
+    enable: true
     username: jeecg
     password: jeecg1314
 #第三方登录

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

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8003
   tomcat:
     max-swallow-size: -1
   error:
@@ -111,14 +111,14 @@ spring:
         # 初始化大小，最小，最大
         initial-size: 5
         min-idle: 5
-        maxActive: 20
+        maxActive: 1000
         # 配置获取连接等待超时的时间
         maxWait: 60000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1
+        #        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,30 +131,42 @@ spring:
         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
-          #url: jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          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: CuiDian1234
-          #password: root
+          password: root
           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
+          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://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
-          username: cuidian
-          password: cuidianUFdata
+          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://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
-          username: cuidian
-          password: cuidianUFdata
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_903_2021
+          username: sa
+          password: Windows2008R2
           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
@@ -181,39 +193,38 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    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
+  uploadType: alioss
   path :
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /opt/jeecg-boot/upload
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /opt/jeecg-boot/webapp
   shiro:
-    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+    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
-  # ElasticSearch 6设置
+    staticDomain: https://static.jeecg.com
+  # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
     cluster-nodes: 127.0.0.1:9200
-    check-enabled: false
+    check-enabled: true
   # 表单设计器配置
   desform:
     # 主题颜色（仅支持 16进制颜色代码）
@@ -224,7 +235,7 @@ jeecg :
       # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
       baidu: ??
   # 在线预览文件服务器地址配置
-  file-view-domain: 127.0.0.1:8012
+  file-view-domain: http://fileview.jeecg.com
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -233,7 +244,7 @@ jeecg :
     bucketName: otatest
   #大屏报表参数设置
   jmreport:
-    mode: dev
+    mode: prod
     #数据字典是否进行saas数据隔离，自己看自己的字典
     saas: false
     #是否需要校验token
@@ -282,7 +293,7 @@ knife4j:
   #开启生产环境屏蔽
   production: false
   basic:
-    enable: false
+    enable: true
     username: jeecg
     password: jeecg1314
 #第三方登录

jeecg-boot-module-system/target/classes/application-fhf.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/senyu?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: abcd1234
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          # 多数据源配置
+        multi-one:
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_901_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_902_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://192.168.5.108;DatabaseName=UFDATA_903_2021
+          username: sa
+          password: Windows2008R2
+          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/application-prod.yml

@@ -131,31 +131,31 @@ spring:
         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
+          url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_prod?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
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_101_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
+          url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_102_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: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-four:
           url: jdbc:sqlserver://192.168.1.253;DatabaseName=UFDATA_903_2021
           username: sa
           password: Windows2008R2
           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

jeecg-boot-module-system/target/classes/application-prodpda.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/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: dev
+    active: fhf

jeecg-boot-module-system/target/classes/logback-spring.xml

@@ -61,10 +61,11 @@
 	<!-- 每天生成一个html格式的日志结束 -->
 
 	<!--myibatis log configure -->
-	<logger name="com.apache.ibatis" level="TRACE" />
-	<logger name="java.sql.Connection" level="DEBUG" />
-	<logger name="java.sql.Statement" level="DEBUG" />
-	<logger name="java.sql.PreparedStatement" level="DEBUG" />
+    <logger name="com.apache.ibatis" level="TRACE" />
+    <logger name="java.sql.Connection" level="DEBUG" />
+    <logger name="java.sql.Statement" level="DEBUG" />
+    <logger name="java.sql.PreparedStatement" level="DEBUG" />
+    <logger name="org.jeecg.modules" level="DEBUG"></logger>
 
 	<!-- 日志输出级别 -->
 	<root level="INFO">

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

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -0,0 +1,104 @@
+<?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.letterDeposit.mapper.SyLetterDepositMapper">
+
+
+    <select id="querySyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
+
+select a.document_No as documentNo,a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,b.hod as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
+a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
+sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
+sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
+a.depositary_receipt_no as depositaryReceiptNo,a.spur_Or_Sub_Order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
+b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
+b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,a.salesman as salesman,a.sales_department
+from sy_pre_assembled_packing_list_item b
+left join sy_pre_assembled_packing_list a
+on a.id = b.sy_pre_assembled_packing_list_id
+  ${ew.customSqlSegment}
+    </select>
+
+    <update id="syLetterDepositItemDelete">
+
+        update sy_letter_deposit_item
+        set del_flag = 1
+        where sy_letter_deposit_id = #{id}
+
+    </update>
+
+
+    <insert id="syRmbAdd">
+        insert into sy_rmb (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag)
+        values
+        <foreach collection="rmbList" item="rmbList" separator=",">
+            (
+            #{rmbList.id}, #{rmbList.syLetterDepositId}, #{rmbList.freightForwarder}, #{rmbList.amount}, #{rmbList.itemColumn},0
+            )
+        </foreach>
+
+    </insert>
+
+    <insert id="syUsdAdd">
+        insert into sy_usd (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag)
+        values
+        <foreach collection="usdList" item="usdList" separator=",">
+            (
+            #{usdList.id}, #{usdList.syLetterDepositId}, #{usdList.freightForwarder}, #{usdList.amount}, #{usdList.itemColumn},0
+            )
+        </foreach>
+
+    </insert>
+
+    <update id="syRmbDelete">
+        update sy_rmb
+        set del_flag = '1'
+        where sy_letter_deposit_id = #{syLetterDepositId}
+
+    </update>
+
+    <update id="syUsdDelete">
+        update sy_rmb
+        set del_flag = '1'
+        where sy_letter_deposit_id = #{syLetterDepositId}
+
+    </update>
+
+
+<!--    <select id="mergeSyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">-->
+
+<!--select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre_delivery_date as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,-->
+<!--a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.spur_Or_Sub_Order as spurOrSubOrder,-->
+<!--sum(a.total_net_weight) as totalNetWeight,a.order_type as orderType,sum(b.total_quantity) as totalQuantity,-->
+<!--sum(a.total_gross_weight) as totalGrossWeight,sum(a.total_volume) as totalVolume,a.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,-->
+<!--a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a-->
+<!--left join sy_pre_assembled_packing_list_item b-->
+<!--on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0-->
+<!--  ${ew.customSqlSegment}-->
+
+<!--    </select>-->
+
+    <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
+select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
+a.client_abbreviation as clientAbbreviation,a.exchange_earnings_value as exchangeEarningsValue,
+a.distribution_point as distributionPoint,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
+sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
+a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
+a.the_documents_state as theDocumentsState from sy_letter_deposit a
+left join sy_letter_deposit_item b
+on a.id = b.sy_letter_deposit_id
+  ${ew.customSqlSegment}
+
+    </select>
+
+    <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
+
+        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
+total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
+container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
+hod
+         from sy_letter_deposit_item
+         where del_flag = 0 and sy_letter_deposit_id = #{syId} group by letter_groupid
+
+
+    </select>
+</mapper>

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

@@ -0,0 +1,25 @@
+<?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.SyGetOrderMapper">
+    <select id="getOrderdata" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderDataVO" >
+    SELECT
+	ompoId,ompoIdItem,ompoId,supplierCode,v.cVenAbbName as supplier,iTaxPrice
+	FROM
+	SO_SODetails s
+	left join (
+		SELECT pm.cPOID as ompoCode,pm.POID as ompoId,pd.id as ompoIdItem,
+		pm.cVenCode as supplierCode,pd.iTaxPrice,pd.cInvCode,pd.iorderdid as isosid
+		FROM PO_Pomain pm
+		LEFT JOIN  PO_Podetails pd on pm.POID=pd.POID
+		where pm.cState = 1
+		UNION
+		SELECT om.cCode as ompoCode,om.MOID as ompoId,od.MODetailsID as ompoIdItem,
+		om.cVenCode as supplierCode,od.iTaxPrice,od.cInvCode,od.isosid
+		FROM OM_MOMain om
+		LEFT JOIN  OM_MODetails  od on om.MOID =od.MOID
+		where om.cState = 1
+			) p on s.isosid  = p.isosid and s.cInvCode = p.cInvCode
+	left join Vendor v on p.supplierCode=v.cVenCode
+	where s.id = #{id}
+    </select>
+</mapper>

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

@@ -2,7 +2,22 @@
 <!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
+            sy_order_data_id,item_number,pre_delivery_date,pre_completion_date,pack_id,small_po,distribution_point,
+            inventory_code,inventory_name,specification_and_model,colour,coding_rules,guangpei_gate_width,box_number,
+            sum(quantity) as quantity,master_metering,unit_price_including_tax,sum(total_price_and_tax) as total_price_and_tax,tax_rate,remarks,bank_closed_by
+        FROM
+            sy_order_data_item
+        WHERE
+            sy_order_data_id = #{syOrderDataId}
+        GROUP BY
+            pack_id,
+            small_po,
+            pre_delivery_date,
+            pre_completion_date,
+            item_number,
+            inventory_code,
+            colour,
+            coding_rules
     </select>
 </mapper>

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

@@ -2,4 +2,81 @@
 <!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">
 
+    <select id="queryList" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderData" >
+        SELECT
+            a.id,
+            order_number,
+            order_date,
+            business_type_value,
+            business_type_text,
+            sales_type_value,
+            sales_type_text,
+            customer_abbreviation,
+            customer_name,
+            exchange_rate,
+            sales_department,
+            salesman,
+            currency_value,
+            currency_text,
+            brand_side,
+            third_party,
+            deposit_ratio,
+            deposit,
+            collaborative_route,
+            order_remarks,
+            price_remarks,
+            customer_order_number,
+            sum(b.total_price_and_tax) as whole_order_total,
+            end_customer,
+            term_of_payment,
+            order_change_description,
+            a.memo,
+            supplier,
+            account,
+            dilivery,
+            garment_factory,
+            garment_nmb
+        FROM
+            sy_order_data a
+        left join (
+            select sy_order_data_id,sum(total_price_and_tax) as total_price_and_tax,inventory_ccode,
+                sum(surplus_num) as surplus_num,sum(quantity) as quantity
+            FROM sy_order_data_item GROUP BY sy_order_data_id
+        ) b on a.id=b.sy_order_data_id
+        WHERE 1=1
+            <if test="sy.orderNumber != null and sy.orderNumber !=''">
+                AND order_number = #{sy.orderNumber}
+            </if>
+             <if test="sy.customerAbbreviation != null and sy.customerAbbreviation !=''">
+                 AND customer_abbreviation = #{sy.customerAbbreviation}
+             </if>
+             <if test="sy.dateStar !=null and sy.dateStar !='' and sy.dateEnd !=null and sy.dateEnd !='' ">
+                 AND order_date BETWEEN #{sy.dateStar} AND #{sy.dateEnd}
+             </if>
+             <if test="sy.account != null and sy.account !=''">
+                 AND account = #{sy.account}
+             </if>
+            <if test="sy.salesDepartment != null and sy.salesDepartment !=''">
+                AND sales_department = #{sy.salesDepartment}
+            </if>
+            <if test="sy.salesman != null and sy.salesman !=''">
+                AND salesman = #{sy.salesman}
+            </if>
+             <if test="(sy.dilivery != null and sy.dilivery != '') and (sy.dilivery == '0' or sy.dilivery ==0)">
+                 AND b.surplus_num <![CDATA[ < ]]> b.quantity
+             </if>
+            <if test="(sy.dilivery != null and sy.dilivery != '') and (sy.dilivery == '1' or sy.dilivery ==1)">
+                AND b.surplus_num <![CDATA[ >= ]]> b.quantity
+            </if>
+             <if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '0' or sy.isProduct ==0) ">
+                 AND (b.inventory_ccode like '19%' )
+             </if>
+             <if test="(sy.isProduct != null and sy.isProduct != '') and (sy.isProduct == '1' or sy.isProduct == 1) ">
+                 AND (b.inventory_ccode not like '19%')
+             </if>
+        GROUP BY a.id
+        ORDER BY
+            order_date DESC
+    </select>
+
 </mapper>

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

@@ -4,38 +4,97 @@
 
     <select id="queryOrderData" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
 
-        select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,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_value as businessTypeText,a.customer_order_number as customerOrderNumber,
-           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.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,b.unit_price_including_tax as unitPriceIncludingTax,
+        select b.sy_order_data_id as syOrderDataId,GROUP_CONCAT(b.id) as syOrderDataItemId ,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,sum(b.quantity) as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,sum(b.surplus_num) as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
+           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
+           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,
+           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
            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
+             a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
+             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.OMPO_id as OMPOId,b.inventory_ccode as inventoryCcode
+             from sy_order_data_item b
+        left join sy_order_data a
+        on a.id = b.sy_order_data_id
         ${ew.customSqlSegment}
 
+            AND b.inventory_ccode like '19%'
+        group by concat(a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
+        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules)
 
     </select>
 
+
+    <select id="queryOrderDataGarment" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
+
+
+        select b.sy_order_data_id as syOrderDataId,GROUP_CONCAT(b.id) as syOrderDataItemId ,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,sum(b.quantity) as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,sum(b.surplus_num) as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
+           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
+           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,
+           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
+           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,b.supplier as supplier,b.i_tax_price as iTaxPrice,
+             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.OMPO_id as OMPOId,b.inventory_ccode as inventoryCcode
+        from sy_order_data_item b
+        left join sy_order_data a
+        on a.id = b.sy_order_data_id
+        ${ew.customSqlSegment}
+            AND b.inventory_ccode not like '19%'
+         group by concat(a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
+        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules)
+
+    </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,
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
+    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,b.specification_and_model as specificationAndModel,
+    b.small_po as smallPo,b.pack_id as packId,b.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,a.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.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
     b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
-    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,
-    a.english_product_name as englishProductName,a.garment_factory as garmentFactory from sy_shipping_details a
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,
+    a.english_product_name as englishProductName,b.garment_factory as garmentFactory,b.elements_id as elementsId 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
+where a.del_flag = 0
+  AND b.inventory_ccode like '19%'
+
+GROUP BY b.group_id
+ order by a.document_no desc) as t
+${ew.customSqlSegment}
+
+</select>
+
+    <select id="queryShippingDetailsGarment" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
+    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,b.specification_and_model as specificationAndModel,
+    b.small_po as smallPo,b.pack_id as packId,b.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,a.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,b.pre_completion_date as preCompletionDate,
+    b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,
+    a.english_product_name as englishProductName,b.garment_factory as garmentFactory,b.elements_id as elementsId 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
+  AND b.inventory_ccode not like '19%'
+GROUP BY b.group_id
+ order by a.document_no desc) as t
 ${ew.customSqlSegment}
 
 </select>
@@ -43,69 +102,44 @@ ${ew.customSqlSegment}
     <update id="syshippingDetailsItemUpdate">
         update sy_shipping_details_item
         set del_flag = '1'
-        where shipping_details_id = #{shippingDetailsId}
+        where id = #{shippingDetailsId}
     </update>
 
 
     <select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO">
 
-        select account as tenantId,
-        id as accessoriesHeaderId,
-        document_no as packingHeaderNum,--'ACCESSORIES0609-2'
-        'ACCESSORIES' as packingType,
-        'NEW' as packingStatus,
-        --'PO36202206070001' as poNo,
-        --'JAZS001' as containerNumm,
-       --  '2022-06-07' as loadingDate,
-         '01000229' as supplierNumber,
-          --'' as invoiceNum,
-          create_by as preparer,
-          create_time as preparationTime
+        select
+        document_no as packingHeaderNum,--装箱单编号-(发运明细单号)
+        'ACCESSORIES' as packingType,--装箱单类型-(发运明细类型，默认ACCESSORIES)
+        'NEW' as packingStatus,--装箱单状态-(发运明细状态，默认NEW)
+         '01000229' as supplierNumber,--供应商编码（收货）(收货方供应商编码)
+          create_by as preparer,--制单人
+          create_time as preparationTime--制单时间
           from sy_shipping_details
-         where del_flag = 0 and id = #{id}
+          where del_flag = 0 and id = #{id}
 
     </select>
 
     <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
 
         select
-        --'103' as tenantId,
-         -- a.id as accessoriesLineId,
-          --id as accessoriesHeaderIdD,
-          a.sort as packingLineNum,
-          'T0036' as merchandiser,
-          a.order_number as poNo,--'PO36202206070001'
-          a.sy_order_data_id as moDetailId,
-           --'' as poId,
-          a.item_number as styleNo, --'W21-W20-MSP-SPW0001'
-         -- 'C156St2' as batchNo,
-           b.colour 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,
-          a.treatment_method as treatmentMethod,
-          a.manual_yarn_flag as manualYarnFlag,
-          a.manual_yarn_unit_price as manualYarnUnitPrice,
-          a.manual_yarn_proportion as manualYarnProportion,
-          a.memo as remark,
+          a.sort as packingLineNum, -- 行号-(发运明细行号)
+          a.order_number as poNo,--计划单号-(订单号)
+          a.sy_order_data_id as moDetailId,--计划单号行ID-(订单号行ID（母件）)
+          a.item_number as styleNo, --款号
+           b.colour as color,--颜色
+           a.inventory_code as itemCode,--物料编码-（存货编码）
+          a.inventory_name as itemDesc,--项目（辅料品名）-（存货名称）
+          '' as declarationName,--报关品名
+          a.material_composition as composition,--成分-（物料成分）
+          b.guangpei_gate_width as width,--门幅
+          '' as rolls,--匹数
+          a.shipment_quantity as planPackingQty,--计划装箱数量-(发货数量)
+          a.treatment_method as treatmentMethod,--处理方式
+          a.manual_yarn_flag as manualYarnFlag,--是否手册纱
+          a.manual_yarn_unit_price as manualYarnUnitPrice,--手册纱单价
+          a.manual_yarn_proportion as manualYarnProportion,--手册纱占比
+          a.memo as remark,--备注
           '111' as cabinetNum
           from sy_shipping_details_item a
           left join sy_order_data_item b
@@ -114,4 +148,84 @@ ${ew.customSqlSegment}
     </select>
 
 
+    <select id="displayDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
+           select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,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_value as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
+           a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
+           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,
+           b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
+           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,b.supplier as supplier,b.i_tax_price as iTaxPrice,
+             case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.OMPO_id as OMPOId,b.inventory_ccode as inventoryCcode
+             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="exCelQuery" 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,b.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
+    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,a.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,b.pre_completion_date as preCompletionDate,
+    b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,
+    a.english_product_name as englishProductName,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  order by a.document_no desc) as t
+${ew.customSqlSegment}
+    </select>
+
+
+    <update id="updateElenmentId">
+        update sy_shipping_details_item b
+        left  join sy_shipping_details a
+        on b.shipping_details_id = a.id
+        set b.elements_id = #{elementsId}
+        where b.elements_id = #{id} and a.push_state = '0'
+    </update>
+
+    <update id="writeBackElenmentId">
+        update sy_shipping_details_item
+        set elements_id = #{elementsId}
+        where id in
+        <foreach collection="id" item="item"  open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </update>
+
+    <update id="batchSubmission">
+
+        update sy_shipping_details_item
+        <if test='type == "1"'>
+            set submit_status = 1
+            where id in
+            <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test='type == "2"'>
+            set submit_status = 0
+            where id in
+            <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+
+    </update>
+
 </mapper>

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