更改

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
     </select>
 </mapper>

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();
     }

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<WmsGoodsTag> selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId);
+
+    @ApiOperation("修改完成状态为已完成")
+    @PostMapping("/updateState")
+    ResultBean updateState(@RequestParam("sid")String sid,@RequestParam("state") String state);
 }

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<WmsGoodsTag> selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId){
+    public ResultBean<WmsGoodsTag> 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);
+    }
 
 }

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> {
     WmsGoodsTag selectByGoodsId(String oldGoodsId);
 
     IPage<WmsGoodsTag> goodsTagList(IPage<WmsGoodsTag> page,@Param(Constants.WRAPPER) QueryWrapper<WmsGoodsTag> qw);
+
+    @Update("update wms_goods_tag set state=#{state} where sid=#{sid}")
+    void updateState(@Param("sid") String sid,@Param("state") String state);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java

@@ -96,6 +96,7 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
                     .or().like("t.goodsSkuCode", query.getName())
             );
         }
+        qw.eq("t.state", 0);
         qw.orderByDesc("t.createTime");
         IPage<WmsGoodsTag> page = PagerUtil.queryToPage(pagerQuery);
         IPage<WmsGoodsTag> pagging = baseMapper.goodsTagList(page, qw);
@@ -178,7 +179,7 @@ public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, Wm
     }
 
     public List<WmsGoodsTag> 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<WmsGoodsTagMapper, Wm
     public WmsGoodsTag selectByGoodsId(String oldGoodsId) {
         return baseMapper.selectByGoodsId(oldGoodsId);
     }
+
+    public ResultBean updateState(String sid, String state) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateState(sid, state);
+        return rb.success();
+    }
 }

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

@@ -107,7 +107,7 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
 
     List<WmsInventory> 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}")