diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java index efc299d6e7..3d09c13a11 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsFeign.java +++ b/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 initShelves(@PathVariable("sid") String sid); @ApiOperation("上架保存") - @PostMapping("/shelvesSave") + @PostMapping("/save") ResultBean saveInventory(@RequestBody AppOldPartsSJDto dto); @ApiOperation("标签扫描") - @PostMapping("/scan") + @GetMapping("/scan") ResultBean scan(@RequestParam("billId") String billId,@RequestParam("content") String content,@RequestParam("type") String type); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java index ea9864266b..df8ee99a3c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsSJDto.java +++ b/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 goodsList; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 3b7c004428..6801001246 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/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) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java index fe5932624d..741a86db2f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java +++ b/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> list(PagerQuery 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 wmsBusrepairInventorybillDetailOlds = new ArrayList<>(); + WmsOldGroundConfirmApp wmsOldGroundConfirmApp = new WmsOldGroundConfirmApp(); + wmsOldGroundConfirmApp.setCreateBySid(dto.getUserSid()); + wmsOldGroundConfirmApp.setOrgPath(dto.getOrgPath()); + wmsOldGroundConfirmApp.setBillId(dto.getSid()); + List wmsBusrepairInventorybillDetailOldApps = new ArrayList<>(); List 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("请扫描库位码"); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java index f2728d971c..ef5e867038 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asbusrepairbill/AsbusrepairBillFegin.java +++ b/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 fetchBySid(@RequestParam String sid); + @GetMapping("/fetchBySid") + AsBusrepairBill fetchBySid(@RequestParam("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryrecord/WmsInventoryRecordFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryrecord/WmsInventoryRecordFeign.java new file mode 100644 index 0000000000..f397547da5 --- /dev/null +++ b/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 selNum(@RequestParam("sourceBillSid") String sourceBillSid, @RequestParam("goodsID") String goodsID); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java deleted file mode 100644 index 7912b2a0b2..0000000000 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java +++ /dev/null @@ -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; -} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java new file mode 100644 index 0000000000..77aa4f407b --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirmApp.java similarity index 63% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirmApp.java index 52c3b0a5a1..93e02f9adc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldGroundConfirm.java +++ b/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 oldList; + private List oldList; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java index c9a31d11a4..b5bc6e1ed4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsOldInventoryFeign.java +++ b/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); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index 65d43dc12c..fc1e2b26cd 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/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") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java index e109086d30..3d80031a5e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java +++ b/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 selNum(@RequestParam("sourceBillSid") String sourceBillSid, @RequestParam("goodsID") String goodsID){ + return wmsInventoryRecordService.selNum(sourceBillSid,goodsID); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java index cbecec460f..d4bf273f71 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java +++ b/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) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java index 56f4338ad5..e3eed4976e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java +++ b/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; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 60fb0a5dcc..7bb919c10a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -91,4 +91,6 @@ public interface WmsInventoryMapper extends BaseMapper { WmsInventory selbyGoodsId(@Param("goodsID") String goodsID); IPage deadStockList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + String selByGoodsIdAndRackSid(@Param("goodsID") String goodsID,@Param("warehouseRackSid") String warehouseRackSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 32b00f99c7..653e44cbcc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -674,4 +674,13 @@ ${ew.sqlSegment} + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 78a305f59f..dad03bdbc9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -1073,4 +1073,8 @@ public class WmsInventoryService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public String selByGoodsIdAndRackSid(String goodsID, String warehouseRackSid) { + return baseMapper.selByGoodsIdAndRackSid(goodsID,warehouseRackSid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java index a452618809..ad9abdbf84 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java +++ b/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 List selBySourceSidAndSkuCode(@Param("sid") String sid,@Param("goodsSkuCode") String goodsSkuCode); String selByGoodsID(String content); + + BigDecimal selNum(@Param("sourceBillSid") String sourceBillSid, @Param("goodsID") String goodsID); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml index ce8be2c19a..eacea6b0d8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml @@ -180,4 +180,14 @@ WHERE billType = '0' AND goodsID = #{content} + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 24824ee309..1ad021eaa2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -424,4 +424,10 @@ public class WmsInventoryRecordService extends MybatisBaseService selNum(String sourceBillSid, String goodsID) { + ResultBean rb = ResultBean.fireFail(); + BigDecimal num = baseMapper.selNum(sourceBillSid,goodsID); + return rb.success().setData(num); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java new file mode 100644 index 0000000000..7addfb3a6d --- /dev/null +++ b/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; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirmApp.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirmApp.java new file mode 100644 index 0000000000..a773d9e29f --- /dev/null +++ b/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 oldList; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 9afbd8cb42..c454d844f6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/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 listPage(PagerQuery pagerQuery) { WmsOldInventoryQuery query = pagerQuery.getParams(); @@ -120,31 +129,40 @@ public class WmsOldInventoryService extends MybatisBaseService 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 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 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(); + } }