1

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitoutRest.java

@@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitout.*;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +47,7 @@ import java.util.List;
 
 @Api(tags = "盘亏出库申请")
 @RestController
-@RequestMapping("v1/wmsinventoryprofitout")
+@RequestMapping("v1/wmsinventoryloss")
 public class WmsInventoryProfitoutRest {
 
 	@Autowired
@@ -78,6 +81,22 @@ public class WmsInventoryProfitoutRest {
 		return rb.success().setData(vo);
 	}
 
+	@ApiOperation("根据部门sid获取盘亏盘点单号")
+	@PostMapping("/getSourceBillNoBySid")
+	public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){
+		ResultBean rb = ResultBean.fireFail();
+		List<InventoryBillVo> voList = wmsInventoryProfitoutService.getSourceBillNoBySid(deptSid);
+		return rb.success().setData(voList);
+	}
+
+	@ApiOperation("根据盘点单sid获取盘亏商品列表")
+	@GetMapping("/sourceBillBySid/{sid}")
+	public ResultBean<List<WmsInventoryProfitoutDetailDto>> sourceBillBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		List<WmsInventoryProfitoutDetailDto> voList = wmsInventoryProfitoutService.sourceBillBySid(sid);
+		return rb.success().setData(voList);
+	}
+
 	@ApiOperation("提交")
 	@PostMapping("/submitApply")
 	public ResultBean submitApply(@Valid @RequestBody SubmitInventoryProfitoutDto dto) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java

@@ -86,4 +86,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
     IPage<WmsInventoryCheckbillPageVo> appDetailRackPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryCheckbill> qw);
 
     List<InventoryBillVo> selPyByDeptSid(String deptSid);
+
+    List<InventoryBillVo> selPkByDeptSid(String deptSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -250,15 +250,33 @@
 				wms_inventory_checkbill wc
 						JOIN
 						(SELECT
-								 SUM(profitCount) AS total
+								 SUM(wd.profitCount) AS total,
+								 wd.billSid AS billSid
 						 FROM
-								 wms_inventory_checkbill wc
-										 LEFT JOIN wms_inventory_checkbill_detail wd
-										 ON wc.sid = wd.billSid
-						 WHERE profitCount > 0) AS total_goods
+								 wms_inventory_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
 		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
+		  AND total_goods.total > 0
+		  AND wc.checkState = 2
+	</select>
+
+	<select id="selPkByDeptSid" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo">
+		SELECT
+				wc.sid AS billSid,
+				wc.billNo
+		FROM
+				wms_inventory_checkbill wc
+						JOIN
+						(SELECT
+								 SUM(wd.loseCount) AS total,
+								 wd.billSid AS billSid
+						 FROM
+								 wms_inventory_checkbill_detail wd
+						 GROUP BY wd.billSid) AS total_goods
+		WHERE wc.deptSid = #{deptSid}
+		  AND total_goods.billSid = wc.sid
 		  AND total_goods.total > 0
 		  AND wc.checkState = 2
-		GROUP BY wc.sid
 	</select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -905,4 +905,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public List<InventoryBillVo> selPyByDeptSid(String deptSid) {
         return baseMapper.selPyByDeptSid(deptSid);
     }
+
+    public List<InventoryBillVo> selPkByDeptSid(String deptSid) {
+        return baseMapper.selPkByDeptSid(deptSid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java

@@ -30,6 +30,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -73,4 +74,6 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper<WmsInvento
     HandleBean scan(@Param("sid") String sid,@Param("content") String content,@Param("houseSid") String houseSid);
 
     List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid);
+
+	List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -131,4 +131,32 @@
 		WHERE billSid = #{sid}
 		  AND profitCount > 0
 	</select>
+
+	<select id="sourceBillPkBySid"
+			resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto">
+		SELECT
+				d.goodsID,
+				d.goodsSpuSid AS goodsSid,
+				d.goodsSpuName,
+				d.goodsSkuSid,
+				d.goodsSkuTitle AS goodsName,
+				d.goodsSkuCode AS goodsCode,
+				d.goodsSkuOwnSpec AS goodsSpec,
+				d.manufacturerSid,
+				d.manufacturerName,
+				d.unit,
+				d.loseCount AS pKNum,
+				d.warehouseSid,
+				d.warehouseName,
+				d.warehouseRackSid,
+				d.warehouseRackName,
+				d.loseCount AS outStorageNum,
+				w.cost AS inStoragePrice
+		FROM
+				wms_inventory_checkbill_detail d
+						LEFT JOIN wms_inventory w
+						ON d.goodsID = w.goodsID
+		WHERE billSid = #{sid}
+		  AND loseCount > 0
+	</select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@@ -43,6 +43,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbi
 import com.yxt.common.base.service.MybatisBaseService;
 
 import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -183,4 +184,8 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
     public List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid) {
         return baseMapper.sourceBillBySid(sid);
     }
+
+    public List<WmsInventoryProfitoutDetailDto> sourceBillPkBySid(String sid) {
+        return baseMapper.sourceBillPkBySid(sid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java

@@ -73,7 +73,7 @@ public class WmsInventoryProfitinDetailsVo implements Vo {
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
 	@ApiModelProperty("业务类型")
-    private String businessVaule; // 业务类型
+    private String businessValue; // 业务类型
     @ApiModelProperty("盘点单sid")
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinDto.java

@@ -69,7 +69,7 @@ public class WmsInventoryProfitinDto implements Dto {
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
 	@ApiModelProperty("业务类型")
-    private String businessVaule; // 业务类型
+    private String businessValue; // 业务类型
 	@ApiModelProperty("盘点单sid")
     private String sourceBillSid; // 盘点单sid
 	@ApiModelProperty("盘点单号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.java

@@ -56,4 +56,8 @@ public interface WmsInventoryProfitinDetailMapper extends BaseMapper<WmsInventor
     void delByMainSid(String mainSid);
 
     List<WmsInventoryProfitinDetailDetailsVo> selByMainSid(String mainSid);
+
+    List<String> selSupplierSid(String businessSid);
+
+    List<WmsInventoryProfitinDetailDetailsVo> selByMainSidAndSupSid(@Param("businessSid") String businessSid,@Param("supplierSid") String supplierSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailMapper.xml

@@ -1,29 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
 
-<select id="selByMainSid"
+    <select id="selByMainSid"
             resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo">
-    SELECT
-            mainSid,
-            goodsSpuSid AS goodsSid,
-            goodsSpuName,
-            goodsSkuSid,
-            goodsSkuTitle AS goodsName,
-            goodsSkuCode AS goodsCode,
-            goodsSkuOwnSpec AS goodsSpec,
-            unit,
-            manufacturerSid,
-            manufacturerName,
-            profitCount AS pyNum,
-            supplierSid,
-            supplierName,
-            inCost AS inStoragePrice,
-            inCount AS inStorageNum
-    FROM
-            wms_inventory_profitin_detail
-    WHERE mainSid = #{mainSid}
-</select>
+        SELECT mainSid,
+               goodsSpuSid     AS goodsSid,
+               goodsSpuName,
+               goodsSkuSid,
+               goodsSkuTitle   AS goodsName,
+               goodsSkuCode    AS goodsCode,
+               goodsSkuOwnSpec AS goodsSpec,
+               unit,
+               manufacturerSid,
+               manufacturerName,
+               profitCount     AS pyNum,
+               supplierSid,
+               supplierName,
+               inCost          AS inStoragePrice,
+               inCount         AS inStorageNum
+        FROM wms_inventory_profitin_detail
+        WHERE mainSid = #{mainSid}
+    </select>
+
+    <select id="selSupplierSid" resultType="java.lang.String">
+        SELECT
+                supplierSid
+        FROM
+                wms_inventory_profitin_detail
+        WHERE mainSid = #{businessSid}
+        GROUP BY supplierSid
+    </select>
+
+    <select id="selByMainSidAndSupSid"
+            resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDetailsVo">
+        SELECT mainSid,
+               goodsSpuSid     AS goodsSid,
+               goodsSpuName,
+               goodsSkuSid,
+               goodsSkuTitle   AS goodsName,
+               goodsSkuCode    AS goodsCode,
+               goodsSkuOwnSpec AS goodsSpec,
+               unit,
+               manufacturerSid,
+               manufacturerName,
+               profitCount     AS pyNum,
+               supplierSid,
+               supplierName,
+               inCost          AS inStoragePrice,
+               inCount         AS inStorageNum
+        FROM wms_inventory_profitin_detail
+        WHERE mainSid = #{businessSid}
+        AND supplierSid = #{supplierSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitindetail/WmsInventoryProfitinDetailService.java

@@ -63,4 +63,12 @@ public class WmsInventoryProfitinDetailService extends MybatisBaseService<WmsInv
 	public List<WmsInventoryProfitinDetailDetailsVo> selByMainSid(String mainSid) {
 		return baseMapper.selByMainSid(mainSid);
 	}
+
+	public List<String> selSupplierSid(String businessSid) {
+		return baseMapper.selSupplierSid(businessSid);
+	}
+
+	public List<WmsInventoryProfitinDetailDetailsVo> selByMainSidAndSupSid(String businessSid, String supplierSid) {
+		return baseMapper.selByMainSidAndSupSid(businessSid,supplierSid);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDetailsVo.java

@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.yxt.wms.biz.inventory.wmsinventoryprofitindetail.WmsInventoryProfitinDetailDto;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDetailsVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDto;
 import io.swagger.annotations.ApiModel;
@@ -57,44 +58,41 @@ public class WmsInventoryProfitoutDetailsVo implements Vo {
 
     private String sid; // sid
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    @ApiModelProperty("申请日期")
-    private Date createTime;
     @ApiModelProperty("单据编号")
     private String billNo; // 单据编号
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请人sid")
     private String createBySid;
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("业务类型")
-    private String busType; // 业务类型
-	@ApiModelProperty("盘点单sid")
-    private String checkBillSid; // 盘点单sid
-	@ApiModelProperty("盘点单号")
-    private String checkBillNo; // 盘点单号
+    @ApiModelProperty("业务类型")
+    private String businessValue; // 业务类型
+    @ApiModelProperty("盘点单sid")
+    private String sourceBillSid; // 盘点单sid
+    @ApiModelProperty("盘点单号")
+    private String sourceBillNo; // 盘点单号
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
-    private Date finishTime;
-	@ApiModelProperty("流程定义的id")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeId; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty
-    private List<WmsInventoryProfitoutDetailDetailsVo> wmsInventoryProfitoutDetailList;
+    private List<WmsInventoryProfitoutDetailDetailsVo> goodsList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutDto.java

@@ -57,41 +57,41 @@ public class WmsInventoryProfitoutDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("单据编号")
+    @ApiModelProperty("单据编号")
     private String billNo; // 单据编号
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("申请人sid")
     private String createBySid;
-	@ApiModelProperty("制单人姓名")
+    @ApiModelProperty("制单人姓名")
     private String createByName; // 制单人姓名
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("业务类型")
-    private String busType; // 业务类型
-	@ApiModelProperty("盘点单sid")
-    private String checkBillSid; // 盘点单sid
-	@ApiModelProperty("盘点单号")
-    private String checkBillNo; // 盘点单号
+    @ApiModelProperty("业务类型")
+    private String businessValue; // 业务类型
+    @ApiModelProperty("盘点单sid")
+    private String sourceBillSid; // 盘点单sid
+    @ApiModelProperty("盘点单号")
+    private String sourceBillNo; // 盘点单号
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
-    private Date finishTime;
-	@ApiModelProperty("流程定义的id")
+    private Date finishTime; // 办结时间
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeId; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty
-    private List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList;
+    private List<WmsInventoryProfitoutDetailDto> goodsList;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutMapper.xml

@@ -4,7 +4,18 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitout.WmsInventoryProfitoutVo">
-		SELECT * FROM wms_inventory_profitout wip
+		SELECT wip.sid,
+		wip.nodeState,
+		wip.billNo,
+		wip.deptName,
+		wip.createByName,
+		wip.createTime,
+		wip.finishTime,
+		wip.checkBillNo as sourceBillNo,
+		wip.busType as businessType,
+		wip.procDefId,
+		wip.procInstId
+		FROM wms_inventory_profitout wip
 		LEFT JOIN anrui_portal.sys_organization as s ON wip.deptSid = s.sid
 		<where> ${ew.sqlSegment} </where>
 	</select>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutQuery.java

@@ -58,13 +58,13 @@ public class WmsInventoryProfitoutQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("申请日期")
-    private String createTimeStart;
-    private String createTimeEnd;
+    private String createStartTime;
+    private String createEndTime;
     @ApiModelProperty("办结日期")
-    private String finishTimeStart;
-    private String finishTimeEnd;
+    private String finishStartTime;
+    private String finishEndTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
 
     private String orgPath;
     private String userSid;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java

@@ -32,6 +32,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbill.WmsInventoryCheckbillService;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService;
+import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitin;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitinVo;
 import com.yxt.wms.biz.inventory.wmsinventoryprofitin.flowable.*;
@@ -92,6 +95,10 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 	private MessageFeign messageFeign;
 	@Autowired
 	private WmsInventoryProfitoutDetailService wmsInventoryProfitoutDetailService;
+	@Autowired
+	private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+	@Autowired
+	private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
 	
 	public PagerVo<WmsInventoryProfitoutVo> listPageVo(PagerQuery<WmsInventoryProfitoutQuery> pq) {
 		WmsInventoryProfitoutQuery query = pq.getParams();
@@ -144,16 +151,16 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		if (StringUtils.isNotBlank(query.getBillNo())) {
 			qw.like("wip.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getCheckBillNo())){
-			qw.like("wip.checkBillNo",query.getCheckBillNo());
+		if (StringUtils.isNotBlank(query.getSourceBillNo())){
+			qw.like("wip.checkBillNo",query.getSourceBillNo());
 		}
-		String createTimeStart = query.getCreateTimeStart();
-		String createTimeEnd = query.getCreateTimeEnd();
+		String createTimeStart = query.getCreateStartTime();
+		String createTimeEnd = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createTimeStart), "date_format (wip.createTime,'%Y-%m-%d') >= date_format('" + createTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(createTimeEnd), "date_format (wip.createTime,'%Y-%m-%d') <= date_format('" + createTimeEnd + "','%Y-%m-%d')"
 				);
-		String finishTimeStart = query.getFinishTimeStart();
-		String finishTimeEnd = query.getFinishTimeEnd();
+		String finishTimeStart = query.getFinishStartTime();
+		String finishTimeEnd = query.getFinishEndTime();
 		qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (wip.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
 				apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (wip.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
 				);
@@ -166,7 +173,7 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 	public ResultBean<String> saveOrUpdateDto(WmsInventoryProfitoutDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList = dto.getWmsInventoryProfitoutDetailList();
+		List<WmsInventoryProfitoutDetailDto> wmsInventoryProfitoutDetailList = dto.getGoodsList();
 		String deptSid = dto.getDeptSid();
 		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
 		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
@@ -205,6 +212,9 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		WmsInventoryProfitout entity = new WmsInventoryProfitout();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		entity.setNodeState("待提交");
+		entity.setBusType(dto.getBusinessValue());
+		entity.setCheckBillSid(dto.getSourceBillSid());
+		entity.setCheckBillNo(dto.getSourceBillNo());
 		baseMapper.insert(entity);
 		return entity.getSid();
 	}
@@ -223,8 +233,11 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		WmsInventoryProfitout entity = fetchBySid(sid);
 		WmsInventoryProfitoutDetailsVo vo = new WmsInventoryProfitoutDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
+		vo.setSourceBillSid(entity.getCheckBillSid());
+		vo.setSourceBillNo(entity.getBillNo());
+		vo.setBusinessValue(entity.getBusType());
 		List<WmsInventoryProfitoutDetailDetailsVo> wmsInventoryProfitoutDetailDetailsVos = wmsInventoryProfitoutDetailService.selByMainSid(sid);
-		vo.setWmsInventoryProfitoutDetailList(wmsInventoryProfitoutDetailDetailsVos);
+		vo.setGoodsList(wmsInventoryProfitoutDetailDetailsVos);
 		return vo;
 	}
 
@@ -544,4 +557,12 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		flowFeign.delegate(delegateQuery);
 		return rb.success();
 	}
+
+	public List<InventoryBillVo> getSourceBillNoBySid(String deptSid) {
+		return wmsInventoryCheckbillService.selPkByDeptSid(deptSid);
+	}
+
+	public List<WmsInventoryProfitoutDetailDto> sourceBillBySid(String sid) {
+		return wmsInventoryCheckbillDetailService.sourceBillPkBySid(sid);
+	}
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutVo.java

@@ -68,9 +68,9 @@ public class WmsInventoryProfitoutVo implements Vo {
     @ApiModelProperty("办结日期")
     private Date finishTime;
     @ApiModelProperty("盘点单号")
-    private String checkBillNo;
+    private String sourceBillNo;
     @ApiModelProperty("业务类型")
-    private String busType;
+    private String businessType;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetail.java

@@ -85,7 +85,7 @@ public class WmsInventoryProfitoutDetail extends BaseEntity {
 	@ApiModelProperty("入库单价")
     private BigDecimal inCost; // 入库单价
 	@ApiModelProperty("盘亏数量")
-    private BigDecimal lossCount; // 盘亏数量
+    private BigDecimal loseCount; // 盘亏数量
 	@ApiModelProperty("出库数量")
     private BigDecimal outCount; // 出库数量
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDetailsVo.java

@@ -57,37 +57,38 @@ public class WmsInventoryProfitoutDetailDetailsVo implements Vo {
     private String mainSid; // 主表sid
 	@ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
+    @ApiModelProperty("图号")
+    private String goodsCode;
     @ApiModelProperty("商品spuSid")
-    private String goodsSpuSid;
+    private String goodsSid;
     @ApiModelProperty("商品spu名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品sku名称")
-    private String goodsSkuTitle;
-    @ApiModelProperty("图号")
-    private String goodsSkuCode;
+    private String goodsName;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
+    private String goodsSpec;
+    @ApiModelProperty("入库单价")
+    private String inStoragePrice;
+    @ApiModelProperty("盘亏数量")
+    private String pkNum;
     @ApiModelProperty("厂家sid")
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-	@ApiModelProperty("单位")
+    @ApiModelProperty("单位")
     private String unit; // 单位
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
+    @ApiModelProperty("库位名称")
     private String warehouseRackName; // 库位名称
-	@ApiModelProperty("入库单价")
-    private BigDecimal inCost; // 入库单价
-	@ApiModelProperty("盘亏数量")
-    private BigDecimal lossCount; // 盘亏数量
-	@ApiModelProperty("出库数量")
-    private BigDecimal outCount; // 出库数量
+    @ApiModelProperty("出库数量")
+    private BigDecimal outStorageNum; // 出库数量
 
+    private String money;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailDto.java

@@ -53,41 +53,43 @@ public class WmsInventoryProfitoutDetailDto implements Dto {
 
     private String sid; // sid
 
-	@ApiModelProperty("主表sid")
+    @ApiModelProperty("主表sid")
     private String mainSid; // 主表sid
-	@ApiModelProperty("商品ID")
+    @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
+    @ApiModelProperty("图号")
+    private String goodsCode;
     @ApiModelProperty("商品spuSid")
-    private String goodsSpuSid;
+    private String goodsSid;
     @ApiModelProperty("商品spu名称")
     private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
     @ApiModelProperty("商品sku名称")
-    private String goodsSkuTitle;
-    @ApiModelProperty("图号")
-    private String goodsSkuCode;
+    private String goodsName;
     @ApiModelProperty("规格")
-    private String goodsSkuOwnSpec;
+    private String goodsSpec;
+    @ApiModelProperty("入库单价")
+    private String inStoragePrice;
+    @ApiModelProperty("盘亏数量")
+    private String pkNum;
     @ApiModelProperty("厂家sid")
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
-	@ApiModelProperty("单位")
+    @ApiModelProperty("单位")
     private String unit; // 单位
-	@ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库sid")
     private String warehouseSid; // 仓库sid
-	@ApiModelProperty("仓库名称")
+    @ApiModelProperty("仓库名称")
     private String warehouseName; // 仓库名称
-	@ApiModelProperty("库位sid")
+    @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
+    @ApiModelProperty("库位名称")
     private String warehouseRackName; // 库位名称
-	@ApiModelProperty("入库单价")
-    private BigDecimal inCost; // 入库单价
-	@ApiModelProperty("盘亏数量")
-    private BigDecimal lossCount; // 盘亏数量
-	@ApiModelProperty("出库数量")
-    private BigDecimal outCount; // 出库数量
+    @ApiModelProperty("出库数量")
+    private BigDecimal outStorageNum; // 出库数量
+
+    private String money;
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.java

@@ -52,6 +52,5 @@ public interface WmsInventoryProfitoutDetailMapper extends BaseMapper<WmsInvento
     @Delete("delete from wms_inventory_profitout_detail where mainSid = #{mainSid}")
     void delByMainSid(String mainSid);
 
-    @Select("select * from wms_inventory_profitout_detail where mainSid = #{mainSid}")
     List<WmsInventoryProfitoutDetailDetailsVo> selByMainSid(String mainSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailMapper.xml

@@ -3,4 +3,30 @@
 <mapper namespace="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+
+<select id="selByMainSid"
+            resultType="com.yxt.wms.biz.inventory.wmsinventoryprofitoutdetail.WmsInventoryProfitoutDetailDetailsVo">
+    SELECT
+            mainSid,
+            goodsID,
+            goodsSpuSid AS goodsSid,
+            goodsSpuName,
+            goodsSkuSid,
+            goodsSkuTitle AS goodsName,
+            goodsSkuCode AS goodsCode,
+            goodsSkuOwnSpec AS goodsSpec,
+            unit,
+            manufacturerSid,
+            manufacturerName,
+            lossCount AS pkNum,
+            warehouseSid,
+            warehouseName,
+            warehouseRackSid,
+            warehouseRackName,
+            inCost AS inStoragePrice,
+            outCount AS outStorageNum
+    FROM
+            wms_inventory_profitout_detail
+    WHERE mainSid = #{mainSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitoutdetail/WmsInventoryProfitoutDetailService.java

@@ -30,6 +30,7 @@ import com.yxt.common.base.service.MybatisBaseService;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -51,6 +52,13 @@ public class WmsInventoryProfitoutDetailService extends MybatisBaseService<WmsIn
 	public void insertByDto(WmsInventoryProfitoutDetailDto dto){
 		WmsInventoryProfitoutDetail entity = new WmsInventoryProfitoutDetail();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setGoodsSpuSid(dto.getGoodsSid());
+		entity.setGoodsSkuTitle(dto.getGoodsName());
+		entity.setGoodsSkuCode(dto.getGoodsCode());
+		entity.setGoodsSkuOwnSpec(dto.getGoodsSpec());
+		entity.setLoseCount(new BigDecimal(dto.getPkNum()));
+		entity.setInCost(new BigDecimal(dto.getInStoragePrice()));
+		entity.setOutCount(dto.getOutStorageNum());
 		baseMapper.insert(entity);
 	}
 	

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java

@@ -12,5 +12,8 @@ public class BaseSupplierInfoDetailsVo {
 
     @ApiModelProperty("供应商名称")
     private String supplierName;
-
+    @ApiModelProperty("供应商联系人")
+    private String contactName;
+    @ApiModelProperty("电话")
+    private String contactTelePhone;
 }