Merge remote-tracking branch 'origin/master'

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java

@@ -41,10 +41,10 @@ public interface AppOldPartsFeign {
     public ResultBean<AppOldPartsSJDetails> initShelves(@PathVariable("sid") String sid);
 
     @ApiOperation("上架保存")
-    @PostMapping("/shelvesSave")
+    @PostMapping("/save")
     ResultBean saveInventory(@RequestBody AppOldPartsSJDto dto);
 
     @ApiOperation("标签扫描")
-    @PostMapping("/scan")
+    @GetMapping("/scan")
     ResultBean<AppOldPartsScanVo> scan(@RequestParam("billId") String billId,@RequestParam("content") String content,@RequestParam("type") String type);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java

@@ -16,8 +16,8 @@ public class AppOldPartsSJDto implements Dto {
 
     private String userSid;
     private String orgPath;
-    @ApiModelProperty("上架单sid")
-    private String shelvesSid;
-    @ApiModelProperty("上架单sid")
+    @ApiModelProperty("维修单号")
+    private String sid;
+    @ApiModelProperty("上架商品信息")
     private List<AppOldPartsGoodsSJDto> goodsList;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java

@@ -36,9 +36,9 @@ import com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail.AsBusrepairIn
 import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageQuery;
 import com.yxt.anrui.terminal.fegin.asoldparts.AsBusrepairPageVo;
 import com.yxt.anrui.terminal.fegin.asoldparts.AsOldPartsFeign;
-import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsBusrepairInventorybillDetailOld;
-import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsOldGroundConfirm;
-import com.yxt.anrui.terminal.fegin.wmsoldinventory.WmsOldInventoryFeign;
+import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign;
+import com.yxt.anrui.terminal.fegin.wmsinventoryrecord.WmsInventoryRecordFeign;
+import com.yxt.anrui.terminal.fegin.wmsoldinventory.*;
 import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldPartsReFeign;
 import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDetails;
 import com.yxt.anrui.terminal.fegin.wmsoldregister.WmsOldRegisterDto;
@@ -48,9 +48,11 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -71,6 +73,8 @@ public class AppOldPartsService {
     private WmsOldInventoryFeign wmsOldInventoryFeign;
     @Resource
     private WmsWarehouseRackFeign wmsWarehouseRackFeign;
+    @Resource
+    private WmsInventoryRecordFeign wmsInventoryRecordFeign;
 
     public ResultBean<PagerVo<AppOldPartsVo>> list(PagerQuery<AppOldPartsQuery> pq) {
         AsBusrepairPageQuery asBusrepairPageQuery = new AsBusrepairPageQuery();
@@ -175,20 +179,21 @@ public class AppOldPartsService {
 
     public ResultBean saveInventory(AppOldPartsSJDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        WmsOldGroundConfirm wmsOldGroundConfirm = new WmsOldGroundConfirm();
-        wmsOldGroundConfirm.setCreateBySid(dto.getUserSid());
-        wmsOldGroundConfirm.setOrgPath(dto.getOrgPath());
-        List<WmsBusrepairInventorybillDetailOld> wmsBusrepairInventorybillDetailOlds = new ArrayList<>();
+        WmsOldGroundConfirmApp wmsOldGroundConfirmApp = new WmsOldGroundConfirmApp();
+        wmsOldGroundConfirmApp.setCreateBySid(dto.getUserSid());
+        wmsOldGroundConfirmApp.setOrgPath(dto.getOrgPath());
+        wmsOldGroundConfirmApp.setBillId(dto.getSid());
+        List<WmsBusrepairInventorybillDetailOldApp> wmsBusrepairInventorybillDetailOldApps = new ArrayList<>();
         List<AppOldPartsGoodsSJDto> goodsList = dto.getGoodsList();
         for (AppOldPartsGoodsSJDto appOldPartsGoodsSJDto : goodsList) {
-            WmsBusrepairInventorybillDetailOld wmsBusrepairInventorybillDetailOld = new WmsBusrepairInventorybillDetailOld();
-            wmsBusrepairInventorybillDetailOld.setGoodsID(appOldPartsGoodsSJDto.getGoodsID());
-            wmsBusrepairInventorybillDetailOld.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode());
-            wmsBusrepairInventorybillDetailOld.setCount(appOldPartsGoodsSJDto.getCount());
-            wmsBusrepairInventorybillDetailOlds.add(wmsBusrepairInventorybillDetailOld);
+            WmsBusrepairInventorybillDetailOldApp wmsBusrepairInventorybillDetailOldApp = new WmsBusrepairInventorybillDetailOldApp();
+            wmsBusrepairInventorybillDetailOldApp.setGoodsID(appOldPartsGoodsSJDto.getGoodsID());
+            wmsBusrepairInventorybillDetailOldApp.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode());
+            wmsBusrepairInventorybillDetailOldApp.setCount(appOldPartsGoodsSJDto.getCount());
+            wmsBusrepairInventorybillDetailOldApps.add(wmsBusrepairInventorybillDetailOldApp);
         }
-        wmsOldGroundConfirm.setOldList(wmsBusrepairInventorybillDetailOlds);
-        wmsOldInventoryFeign.saveInventory(wmsOldGroundConfirm);
+        wmsOldGroundConfirmApp.setOldList(wmsBusrepairInventorybillDetailOldApps);
+        wmsOldInventoryFeign.appSaveInventory(wmsOldGroundConfirmApp);
         return rb.success();
     }
 
@@ -204,17 +209,19 @@ public class AppOldPartsService {
                 return rb.setMsg("该商品不属于旧件");
             }
             AsBusrepairInventorybill asBusrepairInventorybill = asBusrepairInventorybillFeign.fetchBySid(asBusrepairInventorybillDetail.getBillSid()).getData();
-            AsBusrepairBill asBusrepairBill = asbusrepairBillFegin.fetchBySid(asBusrepairInventorybill.getSourceBillSid()).getData();
+            AsBusrepairBill asBusrepairBill = asbusrepairBillFegin.fetchBySid(asBusrepairInventorybill.getSourceBillSid());
             if (!billId.equals(asBusrepairBill.getBillNo())) {
                 return rb.setMsg("该商品不属于此维修单");
             }
-            if (StringUtils.isNotBlank(asBusrepairInventorybillDetail.getOldInventorySid())) {
+            BigDecimal num = wmsInventoryRecordFeign.selNum(asBusrepairInventorybill.getSourceBillSid(), content).getData();
+            BigDecimal chae = asBusrepairInventorybillDetail.getCount().subtract(num);
+            if (chae.compareTo(new BigDecimal("1")) < 0) {
                 return rb.setMsg("该商品已完成上架，请选择其他商品");
             }
             appOldPartsScanVo.setType(type);
             appOldPartsScanVo.setGoodsID(content);
             appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle());
-            appOldPartsScanVo.setGoodsMax(asBusrepairInventorybillDetail.getCount().toString());
+            appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString());
         } else if ("1".equals(type)) {//库位码
             if (!content.contains("#")) {
                 return rb.setMsg("请扫描库位码");

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java

@@ -2,13 +2,12 @@ package com.yxt.anrui.terminal.fegin.asbusrepairbill;
 
 import com.yxt.anrui.terminal.api.wms.inventorySearch.AppBusrepairBillVo;
 import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery;
-import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo;
-import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -37,6 +36,6 @@ public interface AsbusrepairBillFegin {
     @ApiOperation("维修工单-站长出厂确认-确认出厂")
     ResultBean statConfirmOut(@RequestBody String[] sids);
 
-    @PostMapping("/fetchBySid")
-    ResultBean<AsBusrepairBill> fetchBySid(@RequestParam String sid);
+    @GetMapping("/fetchBySid")
+    AsBusrepairBill fetchBySid(@RequestParam("sid") String sid);
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryrecord/WmsInventoryRecordFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.fegin.wmsinventoryrecord;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@FeignClient(
+        contextId = "terminal-WmsInventoryRecord",
+        name = "yxt-wms",
+        path = "/apiadmin/inventory/wmsinventoryrecord")
+public interface WmsInventoryRecordFeign {
+
+    @ApiOperation("查询维修单商品入库数量")
+    @PostMapping("/selNum")
+    ResultBean<BigDecimal> selNum(@RequestParam("sourceBillSid") String sourceBillSid, @RequestParam("goodsID") String goodsID);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java

@@ -1,46 +0,0 @@
-package com.yxt.anrui.terminal.fegin.wmsoldinventory;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class WmsBusrepairInventorybillDetailOld {
-
-    private String sid;
-    @ApiModelProperty("商品ID")
-    private String goodsID;
-    @ApiModelProperty("商品基础信息sid")
-    private String goodsSpuSid;
-    @ApiModelProperty("商品名称")
-    private String goodsSpuName;
-    @ApiModelProperty("商品Skusid")
-    private String goodsSkuSid;
-    @ApiModelProperty("商品Sku名称")
-    private String goodsSkuTitle;
-    @ApiModelProperty("商品编码")
-    private String goodsSkuCode;
-    @ApiModelProperty("厂家sid")
-    private String manufacturerSid;
-    @ApiModelProperty("厂家名称")
-    private String manufacturerName;
-    @ApiModelProperty("规格型号")
-    private String goodsSkuOwnSpec;
-    @ApiModelProperty("计量单位")
-    private String unit;
-    @ApiModelProperty("仓库sid")
-    private String warehouseSid;
-    @ApiModelProperty("仓库名称")
-    private String warehouseName;
-    @ApiModelProperty("库区Sid")
-    private String warehouseAreaSid;
-    @ApiModelProperty("库区名称")
-    private String warehouseAreaName;
-    @ApiModelProperty("库位Sid")
-    private String warehouseRackSid;
-    @ApiModelProperty("库位编号")
-    private String warehouseRackCode;
-    @ApiModelProperty("出/退库数量")
-    private BigDecimal count;
-}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java

@@ -0,0 +1,17 @@
+package com.yxt.anrui.terminal.fegin.wmsoldinventory;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class WmsBusrepairInventorybillDetailOldApp {
+
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("库位编号")
+    private String warehouseRackCode;
+    @ApiModelProperty("出/退库数量")
+    private BigDecimal count;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirmApp.java

@@ -6,12 +6,14 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class WmsOldGroundConfirm {
+public class WmsOldGroundConfirmApp {
 
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @ApiModelProperty("维修单号")
+    private String billId;
 
-    private List<WmsBusrepairInventorybillDetailOld> oldList;
+    private List<WmsBusrepairInventorybillDetailOldApp> oldList;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
         path = "/apiadmin/WmsOldInventory")
 public interface WmsOldInventoryFeign {
 
-    @ApiOperation("旧件上架确认")
-    @PostMapping("/saveInventory")
-    ResultBean saveInventory(@RequestBody WmsOldGroundConfirm dto);
+    @ApiOperation("app旧件上架确认")
+    @PostMapping("/appSaveInventory")
+    ResultBean appSaveInventory(@RequestBody WmsOldGroundConfirmApp dto);
 }

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

@@ -139,7 +139,8 @@ public class AsBusrepairBillRest {
     @ApiOperation("获取维修单")
     @GetMapping("/fetchBySid")
     public AsBusrepairBill fetchBySid(@RequestParam("sid") String sid) {
-        return asBusrepairBillService.fetchBySid(sid);
+        AsBusrepairBill asBusrepairBill = asBusrepairBillService.fetchBySid(sid);
+        return asBusrepairBill;
     }
     @ApiOperation("获取维修项目")
     @GetMapping("/fetchSitemByBillSid")

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

@@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
@@ -180,4 +181,9 @@ public class WmsInventoryRecordRest {
 		return wmsInventoryRecordService.saveInventoryRecord(dto);
 	}
 
+	@ApiOperation("查询维修单商品入库数量")
+	@PostMapping("/selNum")
+	ResultBean<BigDecimal> selNum(@RequestParam("sourceBillSid") String sourceBillSid, @RequestParam("goodsID") String goodsID){
+		return wmsInventoryRecordService.selNum(sourceBillSid,goodsID);
+	}
 }

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

@@ -50,6 +50,12 @@ public class WmsOldInventoryRest {
         return wmsOldInventoryService.saveInventory(dto);
     }
 
+    @ApiOperation("app旧件上架确认")
+    @PostMapping("/appSaveInventory")
+    ResultBean appSaveInventory(@RequestBody WmsOldGroundConfirmApp dto){
+        return wmsOldInventoryService.appSaveInventory(dto);
+    }
+
     @ApiOperation("竣工推送待入库旧件")
     @PostMapping("/pushOldStayInvent")
     ResultBean pushOldStayInvent(@RequestBody WmsOldInventoryPush push) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@@ -91,4 +91,6 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
     WmsInventory selbyGoodsId(@Param("goodsID") String goodsID);
 
     IPage<DeadStockVo> deadStockList(IPage<WmsInventory> page,@Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
+
+    String selByGoodsIdAndRackSid(@Param("goodsID") String goodsID,@Param("warehouseRackSid") String warehouseRackSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -674,4 +674,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selByGoodsIdAndRackSid" resultType="java.lang.String">
+        SELECT
+            sid
+        FROM
+            wms_inventory
+        WHERE goodsID = #{goodsID}
+          AND warehouseRackSid = #{warehouseRackSid}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -1073,4 +1073,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         PagerVo<DeadStockVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public String selByGoodsIdAndRackSid(String goodsID, String warehouseRackSid) {
+        return baseMapper.selByGoodsIdAndRackSid(goodsID,warehouseRackSid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java

@@ -39,6 +39,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -88,4 +89,6 @@ public interface WmsInventoryRecordMapper extends BaseMapper<WmsInventoryRecord>
     List<WmsInventoryRecord> selBySourceSidAndSkuCode(@Param("sid") String sid,@Param("goodsSkuCode") String goodsSkuCode);
 
     String selByGoodsID(String content);
+
+    BigDecimal selNum(@Param("sourceBillSid") String sourceBillSid, @Param("goodsID") String goodsID);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml

@@ -180,4 +180,14 @@
         WHERE billType = '0'
           AND goodsID = #{content}
     </select>
+
+    <select id="selNum" resultType="java.math.BigDecimal">
+        SELECT
+            IFNULL(SUM(COUNT),0)
+        FROM
+            wms_inventory_record
+        WHERE goodsID = #{goodsID}
+          AND sourceBillSid = #{sourceBillSid}
+          AND billType = 1
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java

@@ -424,4 +424,10 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
         }
         return rb.success();
     }
+
+    public ResultBean<BigDecimal> selNum(String sourceBillSid, String goodsID) {
+        ResultBean rb = ResultBean.fireFail();
+        BigDecimal num = baseMapper.selNum(sourceBillSid,goodsID);
+        return rb.success().setData(num);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java

@@ -0,0 +1,17 @@
+package com.yxt.wms.biz.inventory.wmsoldinventory;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class WmsBusrepairInventorybillDetailOldApp {
+
+    @ApiModelProperty("商品ID")
+    private String goodsID;
+    @ApiModelProperty("库位编号")
+    private String warehouseRackCode;
+    @ApiModelProperty("出/退库数量")
+    private BigDecimal count;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirmApp.java

@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.inventory.wmsoldinventory;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsOldGroundConfirmApp {
+
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("维修单号")
+    private String billId;
+
+    private List<WmsBusrepairInventorybillDetailOldApp> oldList;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java

@@ -11,15 +11,20 @@ import com.yxt.common.base.utils.StringUtils;
 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.base.wmswarehouserack.WmsWarehouseRack;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
+import com.yxt.wms.biz.inventory.wmsinventory.WmsUpdateCountQuery;
 import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch;
 import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
 import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
+import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
@@ -57,6 +62,10 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     private SysUserFeign sysUserFeign;
     @Autowired
     private AsBusrepairInventorybillDetailFeign asBusrepairInventorybillDetailFeign;
+    @Autowired
+    private WmsWarehouseRackService wmsWarehouseRackService;
+    @Autowired
+    private AsBusrepairBillFeign asBusrepairBillFeign;
 
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
@@ -120,31 +129,40 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         }
         List<WmsBusrepairInventorybillDetailOld> dtos = wmsOldGroundConfirm.getOldList();
         for (WmsBusrepairInventorybillDetailOld wmsBusrepairInventorybillDetailOld : dtos) {
-            WmsInventorySaveDto dto = new WmsInventorySaveDto();
-            dto.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
-            dto.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID());
-            dto.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid());
-            dto.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName());
-            dto.setGoodsSkuSid(wmsBusrepairInventorybillDetailOld.getGoodsSkuSid());
-            dto.setGoodsSkuTitle(wmsBusrepairInventorybillDetailOld.getGoodsSkuTitle());
-            dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOld.getGoodsSkuCode());
-            dto.setGoodsSkuOwnSpec(wmsBusrepairInventorybillDetailOld.getGoodsSkuOwnSpec());
-            dto.setManufacturerSid(wmsBusrepairInventorybillDetailOld.getManufacturerSid());
-            dto.setManufacturerName(wmsBusrepairInventorybillDetailOld.getManufacturerName());
-            dto.setUnit(wmsBusrepairInventorybillDetailOld.getUnit());
-            dto.setCount(wmsBusrepairInventorybillDetailOld.getCount().toString());
-            dto.setWarehouseSid(wmsBusrepairInventorybillDetailOld.getWarehouseSid());
-            dto.setWarehouseName(wmsBusrepairInventorybillDetailOld.getWarehouseName());
-            dto.setWarehouseRackSid(wmsBusrepairInventorybillDetailOld.getWarehouseRackSid());
-            dto.setWarehouseRackCode(wmsBusrepairInventorybillDetailOld.getWarehouseRackCode());
-            dto.setFirstInDate(DateUtil.today());
-            dto.setCreateOrgSid(createOrgSid);
-            dto.setUseOrgSid(useOrgSid);
-            String inSid = wmsInventoryService.saveWmsInventory(dto).getData();
+            String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOld.getGoodsID(), wmsBusrepairInventorybillDetailOld.getWarehouseRackSid());
+            if (StringUtils.isNotBlank(kcSid)){
+                WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
+                wmsUpdateCountQuery.setSid(kcSid);
+                wmsUpdateCountQuery.setCount(wmsBusrepairInventorybillDetailOld.getCount());
+                wmsUpdateCountQuery.setAddOrReduce(0);
+                wmsInventoryService.updateInventoryCount(wmsUpdateCountQuery);
+            }else {
+                WmsInventorySaveDto dto = new WmsInventorySaveDto();
+                dto.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
+                dto.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID());
+                dto.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid());
+                dto.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName());
+                dto.setGoodsSkuSid(wmsBusrepairInventorybillDetailOld.getGoodsSkuSid());
+                dto.setGoodsSkuTitle(wmsBusrepairInventorybillDetailOld.getGoodsSkuTitle());
+                dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOld.getGoodsSkuCode());
+                dto.setGoodsSkuOwnSpec(wmsBusrepairInventorybillDetailOld.getGoodsSkuOwnSpec());
+                dto.setManufacturerSid(wmsBusrepairInventorybillDetailOld.getManufacturerSid());
+                dto.setManufacturerName(wmsBusrepairInventorybillDetailOld.getManufacturerName());
+                dto.setUnit(wmsBusrepairInventorybillDetailOld.getUnit());
+                dto.setCount(wmsBusrepairInventorybillDetailOld.getCount().toString());
+                dto.setWarehouseSid(wmsBusrepairInventorybillDetailOld.getWarehouseSid());
+                dto.setWarehouseName(wmsBusrepairInventorybillDetailOld.getWarehouseName());
+                dto.setWarehouseRackSid(wmsBusrepairInventorybillDetailOld.getWarehouseRackSid());
+                dto.setWarehouseRackCode(wmsBusrepairInventorybillDetailOld.getWarehouseRackCode());
+                dto.setFirstInDate(DateUtil.today());
+                dto.setCreateOrgSid(createOrgSid);
+                dto.setUseOrgSid(useOrgSid);
+                kcSid = wmsInventoryService.saveWmsInventory(dto).getData();
+            }
             //生成出入库记录
             WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
             wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
-            wmsInventoryRecord.setInventorySid(inSid);
+            wmsInventoryRecord.setInventorySid(kcSid);
             wmsInventoryRecord.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID());
             wmsInventoryRecord.setBillType("1");
             wmsInventoryRecord.setBusTypeKey("09");
@@ -168,7 +186,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setHandlerName(sysUserVo.getName());
             wmsInventoryRecordService.save(wmsInventoryRecord);
             //修改维修单中对应商品旧件状态
-            asBusrepairInventorybillDetailFeign.updateOldBySid(wmsBusrepairInventorybillDetailOld.getSid(),wmsBusrepairInventorybillDetailOld.getGoodsID(),wmsBusrepairInventorybillDetailOld.getGoodsSkuCode(),inSid);
+            asBusrepairInventorybillDetailFeign.updateOldBySid(wmsBusrepairInventorybillDetailOld.getSid(),wmsBusrepairInventorybillDetailOld.getGoodsID(),wmsBusrepairInventorybillDetailOld.getGoodsSkuCode(),kcSid);
         }
         return rb.success();
     }
@@ -371,4 +389,86 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         save(wmsOldInventory);
         return rb.success();
     }
+
+    public ResultBean appSaveInventory(WmsOldGroundConfirmApp wmsOldGroundConfirm) {
+        ResultBean rb = ResultBean.fireFail();
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(wmsOldGroundConfirm.getOrgPath()).getData();
+        String useOrgSid = "";
+        List<String> split = Arrays.asList(wmsOldGroundConfirm.getOrgPath().split("/"));
+        if (split.size() > 1) {
+            //获取本级sid获取本级部门信息
+            SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+            useOrgSid = sysOrganization1.getSid();
+        } else {
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+            useOrgSid = sysOrganization.getSid();
+        }
+        AsBusrepairBill asBusrepairBill = asBusrepairBillFeign.selectOneByBillNo(wmsOldGroundConfirm.getBillId()).getData();
+        List<WmsBusrepairInventorybillDetailOldApp> dtos = wmsOldGroundConfirm.getOldList();
+        for (WmsBusrepairInventorybillDetailOldApp wmsBusrepairInventorybillDetailOldApp : dtos) {
+            AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
+            WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
+            String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
+            if (StringUtils.isNotBlank(kcSid)){
+                WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
+                wmsUpdateCountQuery.setSid(kcSid);
+                wmsUpdateCountQuery.setCount(wmsBusrepairInventorybillDetailOldApp.getCount());
+                wmsUpdateCountQuery.setAddOrReduce(0);
+                wmsInventoryService.updateInventoryCount(wmsUpdateCountQuery);
+            }else {
+                WmsInventorySaveDto dto = new WmsInventorySaveDto();
+                dto.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
+                dto.setGoodsID(wmsBusrepairInventorybillDetailOldApp.getGoodsID());
+                dto.setGoodsSpuSid(asBusrepairInventorybillDetail.getGoodsSpuSid());
+                dto.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
+                dto.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
+                dto.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+                dto.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+                dto.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
+                dto.setManufacturerSid(asBusrepairInventorybillDetail.getManufacturerSid());
+                dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
+                dto.setUnit(asBusrepairInventorybillDetail.getUnit());
+                dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
+                dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
+                dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+                dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
+                dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
+                dto.setFirstInDate(DateUtil.today());
+                dto.setCreateOrgSid(createOrgSid);
+                dto.setUseOrgSid(useOrgSid);
+                kcSid = wmsInventoryService.saveWmsInventory(dto).getData();
+            }
+            //生成出入库记录
+            WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
+            wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
+            wmsInventoryRecord.setInventorySid(kcSid);
+            wmsInventoryRecord.setSourceBillSid(asBusrepairBill.getSid());
+            wmsInventoryRecord.setSourceBillSid(asBusrepairBill.getBillNo());
+            wmsInventoryRecord.setGoodsID(wmsBusrepairInventorybillDetailOldApp.getGoodsID());
+            wmsInventoryRecord.setBillType("1");
+            wmsInventoryRecord.setBusTypeKey("09");
+            wmsInventoryRecord.setBusTypeValue("其他入库");
+            wmsInventoryRecord.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
+            wmsInventoryRecord.setGoodsSpuSid(asBusrepairInventorybillDetail.getGoodsSpuSid());
+            wmsInventoryRecord.setGoodsSpuName(asBusrepairInventorybillDetail.getGoodsSpuName());
+            wmsInventoryRecord.setGoodsSkuSid(asBusrepairInventorybillDetail.getGoodsSkuSid());
+            wmsInventoryRecord.setGoodsSkuTitle(asBusrepairInventorybillDetail.getGoodsSkuTitle());
+            wmsInventoryRecord.setGoodsSkuCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
+            wmsInventoryRecord.setGoodsSkuOwnSpec(asBusrepairInventorybillDetail.getGoodsSkuOwnSpec());
+            wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
+            wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());
+            wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
+            wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
+            wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
+            wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
+            wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();
+            wmsInventoryRecord.setHandlerSid(wmsOldGroundConfirm.getCreateBySid());
+            wmsInventoryRecord.setHandlerName(sysUserVo.getName());
+            wmsInventoryRecordService.save(wmsInventoryRecord);
+            //修改维修单中对应商品旧件状态
+            asBusrepairInventorybillDetailFeign.updateOldBySid(asBusrepairInventorybillDetail.getSid(),wmsBusrepairInventorybillDetailOldApp.getGoodsID(),asBusrepairInventorybillDetail.getGoodsSkuCode(),kcSid);
+        }
+        return rb.success();
+    }
 }