|
|
@ -30,6 +30,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.terminal.api.as.firstshelves.*; |
|
|
|
import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeDto; |
|
|
|
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; |
|
|
@ -126,7 +127,7 @@ public class AppStoreChangeService { |
|
|
|
} |
|
|
|
appStoreChangeScanVo.setType(type); |
|
|
|
appStoreChangeScanVo.setSid(wmsInventoryList.get(0).getGoodsSpuSid()); |
|
|
|
appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); |
|
|
|
appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getSid).collect(Collectors.toList())); |
|
|
|
} else { |
|
|
|
List<WmsInventory> wmsInventoryList = wmsInventoryFeign.selByGoodsIDAndUseOrgSidAndWarehouseSid(content, deptSid, storeSid).getData(); |
|
|
|
if (wmsInventoryList == null) { |
|
|
@ -134,7 +135,7 @@ public class AppStoreChangeService { |
|
|
|
} |
|
|
|
appStoreChangeScanVo.setType(type); |
|
|
|
appStoreChangeScanVo.setSid(wmsInventoryList.get(0).getGoodsSpuSid()); |
|
|
|
appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); |
|
|
|
appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getSid).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
} else if ("1".equals(type)) {//库位码
|
|
|
|
if (!content.contains("#")) { |
|
|
@ -174,37 +175,7 @@ public class AppStoreChangeService { |
|
|
|
return rb.success().setData(appStoreChangeScanVo); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean save(AppFirstShelvesDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
List<AppFirstShelvesGoodsDto> goodsList = dto.getGoodsList(); |
|
|
|
WmsInventorySaveDto wmsInventorySaveDto = new WmsInventorySaveDto(); |
|
|
|
wmsInventorySaveDto.setCreateBySid(dto.getUserSid()); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); |
|
|
|
wmsInventorySaveDto.setCreateOrgSid(useOrgSid); |
|
|
|
wmsInventorySaveDto.setUseOrgSid(useOrgSid); |
|
|
|
wmsInventorySaveDto.setFirstInDate(DateUtil.today()); |
|
|
|
for (AppFirstShelvesGoodsDto appFirstShelvesGoodsDto : goodsList) { |
|
|
|
WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(appFirstShelvesGoodsDto.getGoodsID()).getData(); |
|
|
|
WmsInitialDetail wmsInitialDetail = wmsInitialDetailFeign.selBySid(wmsGoodsTag.getBillDetailSid()).getData(); |
|
|
|
WmsHouseInfoVo wmsHouseInfoVo = wmsWarehouseRackFeign.selHouseInfoByFullCode(appFirstShelvesGoodsDto.getHouseCode()).getData(); |
|
|
|
wmsInventorySaveDto.setGoodsSpuSid(wmsGoodsTag.getGoodsSpuSid()); |
|
|
|
wmsInventorySaveDto.setGoodsSpuName(wmsGoodsTag.getGoodsSpuName()); |
|
|
|
wmsInventorySaveDto.setGoodsSkuSid(wmsGoodsTag.getGoodsSkuSid()); |
|
|
|
wmsInventorySaveDto.setGoodsSkuTitle(wmsGoodsTag.getGoodsSkuTitle()); |
|
|
|
wmsInventorySaveDto.setGoodsSkuCode(wmsGoodsTag.getGoodsSkuCode()); |
|
|
|
wmsInventorySaveDto.setGoodsSkuOwnSpec(wmsGoodsTag.getGoodsSkuOwnSpec()); |
|
|
|
wmsInventorySaveDto.setUnit(wmsGoodsTag.getUnit()); |
|
|
|
wmsInventorySaveDto.setCount(appFirstShelvesGoodsDto.getCount()); |
|
|
|
wmsInventorySaveDto.setGoodsID(appFirstShelvesGoodsDto.getGoodsID()); |
|
|
|
wmsInventorySaveDto.setManufacturerSid(wmsInitialDetail.getManufacturerSid()); |
|
|
|
wmsInventorySaveDto.setManufacturerName(wmsInitialDetail.getManufacturerName()); |
|
|
|
wmsInventorySaveDto.setFirstInDate(DateUtil.formatDate(wmsInitialDetail.getFirstInDate())); |
|
|
|
wmsInventorySaveDto.setWarehouseSid(wmsHouseInfoVo.getWarehouseSid()); |
|
|
|
wmsInventorySaveDto.setWarehouseName(wmsHouseInfoVo.getWarehouseName()); |
|
|
|
wmsInventorySaveDto.setWarehouseRackSid(wmsHouseInfoVo.getWarehouseRackSid()); |
|
|
|
wmsInventorySaveDto.setWarehouseRackCode(appFirstShelvesGoodsDto.getHouseCode()); |
|
|
|
wmsInventoryFeign.saveWmsInventory(wmsInventorySaveDto).getData(); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
public ResultBean save(List<AppStoreChangeDto> dto) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
} |