更改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -67,7 +67,6 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
@@ -154,27 +153,16 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     @Autowired
     private BaseVehicleBrandService baseVehicleBrandService;
     @Autowired
-    private BaseManufacturerService baseManufacturerService;
-    @Autowired
     private BaseManufacturerBankService baseManufacturerBankService;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
     @Autowired
-    private BaseInternalPurchaseService baseInternalPurchaseService;
-    @Autowired
     BaseVehicleModelService baseVehicleModelService;
     @Autowired
     private ScmApplyInboundQueryFeign scmApplyInboundQueryFeign;
     @Autowired
     private FlowFeign flowFeign;
 
-    private QueryWrapper<BaseAccadjApply> createQueryWrapper(BaseAccadjApplyQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();
-        return qw;
-    }
-
     public PagerVo<BaseAccadjApplyVo> listPageVo(PagerQuery<BaseAccadjApplyQuery> pq) {
         BaseAccadjApplyQuery query = pq.getParams();
         QueryWrapper<BaseAccadjApply> qw = new QueryWrapper<>();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.as.storechange;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -35,6 +36,7 @@ import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeScanVo;
 import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventory;
 import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign;
 import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventorySaveDto;
+import com.yxt.anrui.terminal.fegin.wmsInventory.WmsStoreChangeDto;
 import com.yxt.anrui.terminal.fegin.wmsgoodstag.GoodsTagListQuery;
 import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTag;
 import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTagFeign;
@@ -176,6 +178,14 @@ public class AppStoreChangeService {
     }
 
     public ResultBean save(List<AppStoreChangeDto> dto) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        List<WmsStoreChangeDto> wmsStoreChangeDtos = new ArrayList<>();
+        for (AppStoreChangeDto appStoreChangeDto : dto) {
+            WmsStoreChangeDto wmsStoreChangeDto = new WmsStoreChangeDto();
+            BeanUtil.copyProperties(appStoreChangeDto,wmsStoreChangeDto);
+            wmsStoreChangeDtos.add(wmsStoreChangeDto);
+        }
+        wmsInventoryFeign.saveKnyw(wmsStoreChangeDtos);
+        return rb.success();
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java

@@ -53,5 +53,5 @@ public interface WmsInventoryFeign {
 
     @ApiOperation("库内移位保存")
     @PostMapping("/saveKnyw")
-    ResultBean saveKnyw(List<WmsStoreChangeDto> dto);
+    ResultBean saveKnyw(@RequestBody List<WmsStoreChangeDto> dto);
 }

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

@@ -327,7 +327,7 @@ public class WmsInventoryRest {
 
     @ApiOperation("库内移位保存")
     @PostMapping("/saveKnyw")
-    ResultBean saveKnyw(List<WmsStoreChangeDto> dto){
+    ResultBean saveKnyw(@RequestBody List<WmsStoreChangeDto> dto){
         return wmsInventoryService.saveKnyw(dto);
     }
 

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

@@ -14,6 +14,7 @@ import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo;
 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.math.BigDecimal;
 import java.util.List;
@@ -119,4 +120,7 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
     List<WmsInventory> selBySpuSidAndUseOrgSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid);
 
     List<WmsInventory> selBySpuSidAndUseOrgSidWarehouseSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid, @Param("sids") List<String> sids);
+
+    @Update("update wms_inventory set count = #{count} where sid = #{sid}")
+    void updateCount(@Param("sid") String sid,@Param("count") String count);
 }

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

@@ -1419,6 +1419,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
     }
 
     public ResultBean saveKnyw(List<WmsStoreChangeDto> dto) {
+        ResultBean rb = ResultBean.fireFail();
         for (WmsStoreChangeDto wmsStoreChangeDto : dto) {
             String sid = wmsStoreChangeDto.getSid();
             WmsInventory wmsInventory = fetchBySid(sid);
@@ -1444,7 +1445,13 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             wmsInventorySaveDto.setWarehouseRackSid(houseInfoVo.getWarehouseRackSid());
             wmsInventorySaveDto.setWarehouseRackCode(houseInfoVo.getWarehouseRackCode());
             saveWmsInventory(wmsInventorySaveDto);
+            if (new BigDecimal(wmsStoreChangeDto.getCount()).compareTo(new BigDecimal(wmsStoreChangeDto.getMaxCount())) == 0){
+                deleteBySid(sid);
+            }else {
+                BigDecimal count = new BigDecimal(wmsStoreChangeDto.getMaxCount()).subtract(new BigDecimal(wmsStoreChangeDto.getCount()));
+                baseMapper.updateCount(sid,count.toString());
+            }
         }
-        return null;
+        return rb.success();
     }
 }