Merge remote-tracking branch 'origin/master'

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java

@@ -37,12 +37,14 @@ import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackB
 import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.AppDelegateQuery;
 import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.PmsPurchaseBackBillFeign;
 import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.PmsPurchasebackBillDetailsVo;
+import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.PmsPurchasebackDetailDetailsVo;
 import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable.*;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
 
@@ -62,6 +64,9 @@ public class AppPurchaseBackBillService {
         AppPurchasebackBillDetailsVo appPurchasebackBillDetailsVo = new AppPurchasebackBillDetailsVo();
         BeanUtil.copyProperties(data,appPurchasebackBillDetailsVo);
         appPurchasebackBillDetailsVo.setProcInsId(data.getProcInstId());
+        BigDecimal backAmount = data.getPmsPurchasebackDetailList().stream().map(PmsPurchasebackDetailDetailsVo::getBackAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+        appPurchasebackBillDetailsVo.setPriceInfo("应收金额：" + data.getReceivableAmount() + "=退货金额：" + backAmount + "-运费：" + data.getBackFreight() + "-退优惠：" + data.getBackDiscountAmount() + "-抵扣欠款" + data.getDeductDebts() + "+误差调整：" + data.getBackErrorAmount());
+        appPurchasebackBillDetailsVo.setGoodsInfo("退货商品列表(数量：" + data.getPmsPurchasebackDetailList().size() + ")");
         return rb.success().setData(appPurchasebackBillDetailsVo);
     }
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java

@@ -29,8 +29,8 @@ public class AsBusrepairPageVo {
     private String vehMark;
     //车架号
     private String vinNo;
-
-
+    //工单环节
+    private String taskName;
     //旧件回收说明
     private String shortss;
     //旧件照片

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -62,6 +62,7 @@
 
     <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
         select b.sid,
+               a.nodeName as taskName,
                a.sid as billSid,
                a.billNo,
                a.billType,

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@@ -64,6 +64,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -238,7 +239,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		BeanUtil.copyProperties(entity, vo);
 		List<PmsPurchasebackDetailDetailsVo> pmsPurchasebackDetailDetailsVos = pmsPurchasebackDetailService.selByMainSid(sid);
 		for (PmsPurchasebackDetailDetailsVo pmsPurchasebackDetailDetailsVo : pmsPurchasebackDetailDetailsVos) {
-			pmsPurchasebackDetailDetailsVo.setAmount(pmsPurchasebackDetailDetailsVo.getCount().multiply(pmsPurchasebackDetailDetailsVo.getTaxPrice()));
+			pmsPurchasebackDetailDetailsVo.setAmount(pmsPurchasebackDetailDetailsVo.getCount().multiply(pmsPurchasebackDetailDetailsVo.getTaxPrice()).setScale(2, RoundingMode.HALF_UP));
 		}
 		vo.setPmsPurchasebackDetailList(pmsPurchasebackDetailDetailsVos);
 		return vo;

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

@@ -53,7 +53,7 @@ public class WmsInventoryProfitinRest {
 
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<WmsInventoryProfitinVo>> listPage(@RequestBody PagerQuery<WmsInventoryProfitinQuery> pq){
+    public ResultBean<PagerVo<WmsInventoryProfitinVo>> listPage(@RequestBody PagerQuery<WmsInventoryProfitinQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<WmsInventoryProfitinVo> pv = wmsInventoryProfitinService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -61,19 +61,19 @@ public class WmsInventoryProfitinRest {
 
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody WmsInventoryProfitinDto dto){
+    public ResultBean save(@RequestBody WmsInventoryProfitinDto dto) {
         return wmsInventoryProfitinService.saveOrUpdateDto(dto);
     }
 
     @ApiOperation("删除盘盈入库")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         return wmsInventoryProfitinService.delAll(sids);
     }
 
     @ApiOperation("编辑回显盘盈入库")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<WmsInventoryProfitinDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<WmsInventoryProfitinDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         WmsInventoryProfitinDetailsVo vo = wmsInventoryProfitinService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
@@ -81,15 +81,15 @@ public class WmsInventoryProfitinRest {
 
     @ApiOperation("根据部门sid获取盘盈盘点单号")
     @PostMapping("/getSourceBillNoBySid")
-	public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){
+    public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid, @RequestParam("warehouseTypeKey") String warehouseTypeKey) {
         ResultBean rb = ResultBean.fireFail();
-		List<InventoryBillVo> voList = wmsInventoryProfitinService.getSourceBillNoBySid(deptSid);
+        List<InventoryBillVo> voList = wmsInventoryProfitinService.getSourceBillNoBySid(deptSid, warehouseTypeKey);
         return rb.success().setData(voList);
     }
 
     @ApiOperation("根据盘点单sid获取盘盈商品列表")
     @GetMapping("/sourceBillBySid/{sid}")
-	public ResultBean<List<WmsInventoryProfitinDetailDto>> sourceBillBySid(@PathVariable("sid") String sid){
+    public ResultBean<List<WmsInventoryProfitinDetailDto>> sourceBillBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<WmsInventoryProfitinDetailDto> voList = wmsInventoryProfitinService.sourceBillBySid(sid);
         return rb.success().setData(voList);
@@ -150,7 +150,7 @@ public class WmsInventoryProfitinRest {
     @ApiOperation(value = "转办")
     @PutMapping(value = "/assignTask")
     @ResponseBody
-	public ResultBean assignTask(@RequestBody InventoryProfitinDelegateQuery query){
+    public ResultBean assignTask(@RequestBody InventoryProfitinDelegateQuery query) {
         return wmsInventoryProfitinService.assignTask(query);
     }
 }

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

@@ -83,9 +83,9 @@ public class WmsInventoryProfitoutRest {
 
 	@ApiOperation("根据部门sid获取盘亏盘点单号")
 	@PostMapping("/getSourceBillNoBySid")
-	public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid){
+	public ResultBean<List<InventoryBillVo>> getSourceBillNoBySid(@RequestParam("deptSid") String deptSid, @RequestParam("warehouseTypeKey") String warehouseTypeKey){
 		ResultBean rb = ResultBean.fireFail();
-		List<InventoryBillVo> voList = wmsInventoryProfitoutService.getSourceBillNoBySid(deptSid);
+		List<InventoryBillVo> voList = wmsInventoryProfitoutService.getSourceBillNoBySid(deptSid,warehouseTypeKey);
 		return rb.success().setData(voList);
 	}
 

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

@@ -80,7 +80,7 @@ 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> selPyByDeptSid(@Param("deptSid") String deptSid,@Param("warehouseTypeKey") String warehouseTypeKey);
 
-    List<InventoryBillVo> selPkByDeptSid(String deptSid);
+    List<InventoryBillVo> selPkByDeptSid(@Param("deptSid") String deptSid,@Param("warehouseTypeKey") String warehouseTypeKey);
 }

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

@@ -253,6 +253,7 @@
 								 wms_inventory_checkbill_detail wd
 						 GROUP BY wd.billSid) AS total_goods
 		WHERE wc.deptSid = #{deptSid}
+		  AND wc.warehouseTypeKey = #{warehouseTypeKey}
 		  AND total_goods.billSid = wc.sid
 		  AND total_goods.total > 0
 		  AND wc.checkState = 2
@@ -272,6 +273,7 @@
 								 wms_inventory_checkbill_detail wd
 						 GROUP BY wd.billSid) AS total_goods
 		WHERE wc.deptSid = #{deptSid}
+		  AND wc.warehouseTypeKey = #{warehouseTypeKey}
 		  AND total_goods.billSid = wc.sid
 		  AND total_goods.total > 0
 		  AND wc.checkState = 2

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

@@ -917,11 +917,11 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         wmsInventoryCheckbillReportService.saveReport(billSid, remarks);
     }
 
-    public List<InventoryBillVo> selPyByDeptSid(String deptSid) {
-        return baseMapper.selPyByDeptSid(deptSid);
+    public List<InventoryBillVo> selPyByDeptSid(String deptSid,String warehouseTypeKey) {
+        return baseMapper.selPyByDeptSid(deptSid,warehouseTypeKey);
     }
 
-    public List<InventoryBillVo> selPkByDeptSid(String deptSid) {
-        return baseMapper.selPkByDeptSid(deptSid);
+    public List<InventoryBillVo> selPkByDeptSid(String deptSid,String warehouseTypeKey) {
+        return baseMapper.selPkByDeptSid(deptSid,warehouseTypeKey);
     }
 }

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

@@ -66,6 +66,10 @@ public class WmsInventoryProfitin extends BaseEntity {
     private String checkBillSid; // 盘点单sid
 	@ApiModelProperty("盘点单号")
     private String checkBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -78,6 +78,10 @@ public class WmsInventoryProfitinDetailsVo implements Vo {
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")
     private String sourceBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -74,6 +74,10 @@ public class WmsInventoryProfitinDto implements Dto {
     private String sourceBillSid; // 盘点单sid
 	@ApiModelProperty("盘点单号")
     private String sourceBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -65,6 +65,8 @@ public class WmsInventoryProfitinQuery implements Query {
     private String finishEndTime;
     @ApiModelProperty("盘点单号")
     private String sourceBillNo;
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
 
     private String orgPath;
     private String userSid;

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

@@ -160,6 +160,7 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
                 return p;
             }
         }
+        qw.eq("wip.warehouseTypeKey",query.getWarehouseTypeKey());
         if (StringUtils.isNotBlank(query.getDeptName())) {
             qw.like("wip.deptName", query.getDeptName());
         }
@@ -624,8 +625,8 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
         return rb.success();
     }
 
-    public List<InventoryBillVo> getSourceBillNoBySid(String deptSid) {
-        return wmsInventoryCheckbillService.selPyByDeptSid(deptSid);
+    public List<InventoryBillVo> getSourceBillNoBySid(String deptSid,String warehouseTypeKey) {
+        return wmsInventoryCheckbillService.selPyByDeptSid(deptSid,warehouseTypeKey);
     }
 
     public List<WmsInventoryProfitinDetailDto> sourceBillBySid(String sid) {

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

@@ -66,6 +66,10 @@ public class WmsInventoryProfitout extends BaseEntity {
     private String checkBillSid; // 盘点单sid
 	@ApiModelProperty("盘点单号")
     private String checkBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -79,6 +79,10 @@ public class WmsInventoryProfitoutDetailsVo implements Vo {
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")
     private String sourceBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -75,6 +75,10 @@ public class WmsInventoryProfitoutDto implements Dto {
     private String sourceBillSid; // 盘点单sid
     @ApiModelProperty("盘点单号")
     private String sourceBillNo; // 盘点单号
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
+    @ApiModelProperty("仓库类型value")
+    private String warehouseTypeValue;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间

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

@@ -65,6 +65,8 @@ public class WmsInventoryProfitoutQuery implements Query {
     private String finishEndTime;
     @ApiModelProperty("盘点单号")
     private String sourceBillNo;
+    @ApiModelProperty("仓库类型key")
+    private String warehouseTypeKey;
 
     private String orgPath;
     private String userSid;

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

@@ -142,6 +142,7 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 				return p;
 			}
 		}
+		qw.eq("wip.warehouseTypeKey",query.getWarehouseTypeKey());
 		if (StringUtils.isNotBlank(query.getDeptName())) {
 			qw.like("wip.deptName", query.getDeptName());
 		}
@@ -558,8 +559,8 @@ public class WmsInventoryProfitoutService extends MybatisBaseService<WmsInventor
 		return rb.success();
 	}
 
-	public List<InventoryBillVo> getSourceBillNoBySid(String deptSid) {
-		return wmsInventoryCheckbillService.selPkByDeptSid(deptSid);
+	public List<InventoryBillVo> getSourceBillNoBySid(String deptSid,String warehouseTypeKey) {
+		return wmsInventoryCheckbillService.selPkByDeptSid(deptSid,warehouseTypeKey);
 	}
 
 	public List<WmsInventoryProfitoutDetailDto> sourceBillBySid(String sid) {