From 969ea827a9e7b2d91cc20945b19b040ee1c88dca Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 28 Feb 2025 17:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerRetwareVehMapper.xml | 6 +++--- .../biz/as/firstshelves/AppFirstShelvesService.java | 13 ++++++++++++- .../fegin/wmsgoodstag/WmsGoodsTagFeign.java | 4 ++++ .../yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java | 12 ++++++++++-- .../inventory/wmsgoodstag/WmsGoodsTagMapper.java | 4 ++++ .../inventory/wmsgoodstag/WmsGoodsTagService.java | 9 ++++++++- .../inventory/wmsinventory/WmsInventoryMapper.java | 2 +- 7 files changed, 42 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml index 5c43ab49dd..5b13584e8b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretwareveh/BaseManufacturerRetwareVehMapper.xml @@ -33,10 +33,10 @@ FROM base_manufacturer_retware_veh mrv LEFT JOIN base_manufacturer_retware mr - ON mrv.`mainSid` = mr.sid + ON mrv.mainSid = mr.sid WHERE mrv.vinNo = #{vinNo} - AND mr.`createOrgSid` = #{createOrgSid} - ORDER BY mr.`createTime` DESC + AND mr.createOrgSid = #{createOrgSid} + ORDER BY mr.createTime DESC LIMIT 1 \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index 08d47d3dde..f90a5ccaff 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -179,7 +179,7 @@ public class AppFirstShelvesService { for (AppFirstShelvesGoodsDto appFirstShelvesGoodsDto : goodsList) { WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(appFirstShelvesGoodsDto.getGoodsID()).getData(); WmsInitialDetail wmsInitialDetail = wmsInitialDetailFeign.selBySid(wmsGoodsTag.getBillDetailSid()).getData(); - if (wmsInitialDetail == null){ + if (wmsInitialDetail == null) { return rb.setMsg("商品" + appFirstShelvesGoodsDto.getGoodsID() + "不存在"); } WmsHouseInfoVo wmsHouseInfoVo = wmsWarehouseRackFeign.selHouseInfoByFullCode(appFirstShelvesGoodsDto.getHouseCode()).getData(); @@ -200,6 +200,17 @@ public class AppFirstShelvesService { wmsInventorySaveDto.setWarehouseRackSid(wmsHouseInfoVo.getWarehouseRackSid()); wmsInventorySaveDto.setWarehouseRackCode(wmsHouseInfoVo.getWarehouseRackCode()); wmsInventoryFeign.saveWmsInventory(wmsInventorySaveDto).getData(); + String count = wmsInventoryFeign.selCountByGoodsID(appFirstShelvesGoodsDto.getGoodsID()).getData(); + BigDecimal num = null; + if (StringUtils.isNotBlank(count)) { + num = new BigDecimal(count); + } else { + num = new BigDecimal("0"); + } + BigDecimal chae = wmsGoodsTag.getGoodsCount().subtract(num); + if (chae.compareTo(BigDecimal.ZERO) == 0) { + wmsGoodsTagFeign.updateState(wmsGoodsTag.getSid(), "1"); + } } return rb.success(); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java index ba01bafb41..61fa1a42ab 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java @@ -27,4 +27,8 @@ public interface WmsGoodsTagFeign { @ApiOperation("根据商品ID查询标签信息") @PostMapping("/selectByGoodsId") public ResultBean selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId); + + @ApiOperation("修改完成状态为已完成") + @PostMapping("/updateState") + ResultBean updateState(@RequestParam("sid")String sid,@RequestParam("state") String state); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java index 3c3db72a36..640b52db9e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java @@ -62,10 +62,18 @@ public class WmsGoodsTagRest { @ApiOperation("根据旧件商品goodsID查询标签信息") @PostMapping("/selectByGoodsId") - public ResultBean selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId){ + public ResultBean selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId) { ResultBean rb = ResultBean.fireFail(); WmsGoodsTag wmsGoodsTag = wmsWmsGoodsTagService.selectByGoodsId(oldGoodsId); return rb.success().setData(wmsGoodsTag); - }; + } + + ; + + @ApiOperation("修改完成状态为已完成") + @PostMapping("/updateState") + ResultBean updateState(@RequestParam("sid") String sid, @RequestParam("state") String state) { + return wmsWmsGoodsTagService.updateState(sid, state); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java index 99a3e4bb4f..0d333604fc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java @@ -10,6 +10,7 @@ import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -36,4 +37,7 @@ public interface WmsGoodsTagMapper extends BaseMapper { WmsGoodsTag selectByGoodsId(String oldGoodsId); IPage goodsTagList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update wms_goods_tag set state=#{state} where sid=#{sid}") + void updateState(@Param("sid") String sid,@Param("state") String state); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java index fc3b48335a..fec5fa57f7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java @@ -96,6 +96,7 @@ public class WmsGoodsTagService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.goodsTagList(page, qw); @@ -178,7 +179,7 @@ public class WmsGoodsTagService extends MybatisBaseService selByBillSidAndBillDetailsSidAndGoodsSpuSid(String billSid, String sid, String goodsSpuSid) { - return baseMapper.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid,sid,goodsSpuSid); + return baseMapper.selByBillSidAndBillDetailsSidAndGoodsSpuSid(billSid, sid, goodsSpuSid); } public String selectGoodsIDNum(String s) { @@ -217,4 +218,10 @@ public class WmsGoodsTagService extends MybatisBaseService { List selOaInventoryList(@Param("useOrgSid") String useOrgSid, @Param("warehouseTypeValue") String warehouseTypeValue, @Param("name") String name); - @Select("select count from wms_inventory where goodsID = #{goodsID}") + @Select("select SUM(COUNT) from wms_inventory where goodsID = #{goodsID}") String selCountByGoodsID(String goodsID); @Select("select * from wms_inventory where goodsID = #{goodsID} and useOrgSid = #{useOrgSid}")