更改

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

@@ -17,7 +17,7 @@ public class AppOldPartsSJDto implements Dto {
     private String userSid;
     private String orgPath;
     @ApiModelProperty("维修单号")
-    private String billId;
+    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","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail"})
+@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

@@ -48,6 +48,7 @@ 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;
@@ -181,7 +182,7 @@ public class AppOldPartsService {
         WmsOldGroundConfirmApp wmsOldGroundConfirmApp = new WmsOldGroundConfirmApp();
         wmsOldGroundConfirmApp.setCreateBySid(dto.getUserSid());
         wmsOldGroundConfirmApp.setOrgPath(dto.getOrgPath());
-        wmsOldGroundConfirmApp.setBillId(dto.getBillId());
+        wmsOldGroundConfirmApp.setBillId(dto.getSid());
         List<WmsBusrepairInventorybillDetailOldApp> wmsBusrepairInventorybillDetailOldApps = new ArrayList<>();
         List<AppOldPartsGoodsSJDto> goodsList = dto.getGoodsList();
         for (AppOldPartsGoodsSJDto appOldPartsGoodsSJDto : goodsList) {
@@ -220,7 +221,7 @@ public class AppOldPartsService {
             appOldPartsScanVo.setType(type);
             appOldPartsScanVo.setGoodsID(content);
             appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle());
-            appOldPartsScanVo.setGoodsMax(chae.toString());
+            appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString());
         } else if ("1".equals(type)) {//库位码
             if (!content.contains("#")) {
                 return rb.setMsg("请扫描库位码");

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

@@ -28,7 +28,4 @@ public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
     WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode);
 
     List<WmsWarehouseRackVo> getAllTypeByAreaSid(String areaSid);
-
-    @Select("select * from wms_warehouse_rack where rackCode = #{warehouseRackCode}")
-    WmsWarehouseRackVo selByRackCode(String warehouseRackCode);
 }

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

@@ -285,8 +285,4 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
         List<WmsWarehouseRackVo> wmsWarehouseRackVos = baseMapper.getAllTypeByAreaSid(areaSid);
         return rb.success().setData(wmsWarehouseRackVos);
     }
-
-    public WmsWarehouseRackVo selByRackCode(String warehouseRackCode) {
-        return baseMapper.selByRackCode(warehouseRackCode);
-    }
 }

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

@@ -183,7 +183,7 @@
 
     <select id="selNum" resultType="java.math.BigDecimal">
         SELECT
-            SUM(COUNT)
+            IFNULL(SUM(COUNT),0)
         FROM
             wms_inventory_record
         WHERE goodsID = #{goodsID}

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

@@ -11,6 +11,7 @@ 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;
@@ -63,6 +64,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
     private AsBusrepairInventorybillDetailFeign asBusrepairInventorybillDetailFeign;
     @Autowired
     private WmsWarehouseRackService wmsWarehouseRackService;
+    @Autowired
+    private AsBusrepairBillFeign asBusrepairBillFeign;
 
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
@@ -400,11 +403,12 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             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();
-            WmsWarehouseRackVo wmsWarehouseRackVo = wmsWarehouseRackService.selByRackCode(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
-            String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRackVo.getSid());
+            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);
@@ -427,8 +431,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
                 dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
                 dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
                 dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
-                dto.setWarehouseRackSid(wmsWarehouseRackVo.getSid());
-                dto.setWarehouseRackCode(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
+                dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
+                dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
                 dto.setFirstInDate(DateUtil.today());
                 dto.setCreateOrgSid(createOrgSid);
                 dto.setUseOrgSid(useOrgSid);
@@ -438,6 +442,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             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");
@@ -454,8 +460,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
             wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
             wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid());
             wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName());
-            wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRackVo.getSid());
-            wmsInventoryRecord.setWarehouseRackCode(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
+            wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
+            wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();
             wmsInventoryRecord.setHandlerSid(wmsOldGroundConfirm.getCreateBySid());
             wmsInventoryRecord.setHandlerName(sysUserVo.getName());