yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改移动端旧件上架确认的仓库

master
dimengzhe 2 days ago
parent
e260fb1e18
commit
b6ea511f0e
1 changed files with 10 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java

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

@ -11,6 +11,8 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
@ -69,6 +71,9 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
@Autowired @Autowired
private AsBusrepairBillFeign asBusrepairBillFeign; private AsBusrepairBillFeign asBusrepairBillFeign;
@Autowired
private WmsWarehouseInfoService wmsWarehouseInfoService;
public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) { public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
WmsOldInventoryQuery query = pagerQuery.getParams(); WmsOldInventoryQuery query = pagerQuery.getParams();
QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>(); QueryWrapper<WmsOldInventory> qw = new QueryWrapper<>();
@ -594,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData(); AsBusrepairInventorybillDetail asBusrepairInventorybillDetail = asBusrepairInventorybillDetailFeign.getOldDetailsByOldGoodsId(wmsBusrepairInventorybillDetailOldApp.getGoodsID()).getData();
WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode()); WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsBusrepairInventorybillDetailOldApp.getWarehouseRackCode());
String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid()); String kcSid = wmsInventoryService.selByGoodsIdAndRackSid(wmsBusrepairInventorybillDetailOldApp.getGoodsID(), wmsWarehouseRack.getSid());
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseRack.getWarehouseSid());
if (StringUtils.isNotBlank(kcSid)){ if (StringUtils.isNotBlank(kcSid)){
WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery(); WmsUpdateCountQuery wmsUpdateCountQuery = new WmsUpdateCountQuery();
wmsUpdateCountQuery.setSid(kcSid); wmsUpdateCountQuery.setSid(kcSid);
@ -619,8 +625,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName()); dto.setManufacturerName(asBusrepairInventorybillDetail.getManufacturerName());
dto.setUnit(asBusrepairInventorybillDetail.getUnit()); dto.setUnit(asBusrepairInventorybillDetail.getUnit());
dto.setCount(asBusrepairInventorybillDetail.getCount().toString()); dto.setCount(asBusrepairInventorybillDetail.getCount().toString());
dto.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid()); dto.setWarehouseSid(warehouseInfo.getSid());
dto.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName()); dto.setWarehouseName(warehouseInfo.getWarehouseName());
dto.setWarehouseRackSid(wmsWarehouseRack.getSid()); dto.setWarehouseRackSid(wmsWarehouseRack.getSid());
dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode()); dto.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
dto.setFirstInDate(DateUtil.today()); dto.setFirstInDate(DateUtil.today());
@ -659,8 +665,8 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount()); wmsInventoryRecord.setCurrentCount(asBusrepairInventorybillDetail.getCount());
wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit()); wmsInventoryRecord.setUnit(asBusrepairInventorybillDetail.getUnit());
wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount()); wmsInventoryRecord.setCount(asBusrepairInventorybillDetail.getCount());
wmsInventoryRecord.setWarehouseSid(asBusrepairInventorybillDetail.getWarehouseSid()); wmsInventoryRecord.setWarehouseSid(warehouseInfo.getSid());
wmsInventoryRecord.setWarehouseName(asBusrepairInventorybillDetail.getWarehouseName()); wmsInventoryRecord.setWarehouseName(warehouseInfo.getWarehouseName());
wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid()); wmsInventoryRecord.setWarehouseRackSid(wmsWarehouseRack.getSid());
wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode()); wmsInventoryRecord.setWarehouseRackCode(wmsWarehouseRack.getRackCode());
SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData();

Write Preview
Loading…
Cancel
Save