|
@@ -83,11 +83,11 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
|
MaterialClass material = warehousingMapper.getMaterial(new Notice().setMaterialCode(askGoods.getWllbCode()));
|
|
|
Inventory inventory = new Inventory();
|
|
|
askGoods.setCompanyNumber(askGoods.getAccountSleeve());
|
|
|
- if(material.getPartType().equals("原材料")){
|
|
|
+ if(material.getPartType().equals("原材料")) {
|
|
|
inventory = askGoodsMapper.getInventory(askGoods);
|
|
|
- } else if(material.getPartType().equals("产成品")){
|
|
|
+ } else if(material.getPartType().equals("产成品")) {
|
|
|
inventory = deliveryMapper.getInventoryHalf(askGoods);
|
|
|
- } else if(material.getPartType().equals("半成品")){
|
|
|
+ } else if(material.getPartType().equals("半成品")) {
|
|
|
inventory = askGoodsMapper.getInventoryInfo(askGoods).get(0);
|
|
|
}
|
|
|
if(inventory == null){
|
|
@@ -126,6 +126,13 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
|
askGoodsMapper.addRemoval(askGoods);//插入出库流水
|
|
|
askGoodsMapper.deleteVirtual(askGoods.getId());//删除已出虚拟表库存
|
|
|
warehouseTransferMapper.updateOutNum(askGoods.getNum(), askGoodsId, materialId);//修改出库数量
|
|
|
+ if(askGoods.getStorageLocationCodeRk().indexOf("XNKW") != -1){
|
|
|
+ Inventory inventory1 = new Inventory()
|
|
|
+ .setNum(askGoods.getNum())
|
|
|
+ .setMaterialId(materialId)
|
|
|
+ .setStorageLocationCode(askGoods.getStorageLocationCodeRk());
|
|
|
+ warehousingMapper.updateVitrualNum(inventory1);
|
|
|
+ }
|
|
|
WarehouseTransfer warehouseTransfer1 = new WarehouseTransfer()
|
|
|
.setWarehouseTransferId(warehouseTransfer.getWarehouseTransferId()) //移库单id
|
|
|
.setEntryNumber(warehouseTransfer.getEntryNumber())//分录号
|
|
@@ -143,7 +150,9 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
|
.setWarehouseTransferType(warehouseTransferF.getWarehouseTransferType()); //移库类型
|
|
|
warehouseTransferMapper.addReturnGsWarehouseTransferF(warehouseTransfer1);//新增返回gs数据父表信息
|
|
|
warehousingMapper.addStorage(warehousing);//入库流水
|
|
|
- warehousingMapper.addInventory(warehousing);//库存
|
|
|
+ if(list.get(0).getStorageLocationCodeRk().indexOf("XNKW") > 0){
|
|
|
+ warehousingMapper.addInventory(warehousing);//库存
|
|
|
+ }
|
|
|
map.put("data", warehouseTransferCode);
|
|
|
map.put("msg", "200");
|
|
|
}catch (Exception e){
|
|
@@ -206,7 +215,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
|
.setCompanyNumber(warehouseTransfer.getAccountSleeve());
|
|
|
Inventory inventory = new Inventory();
|
|
|
if(material.getPartType().equals("原材料")){
|
|
|
- inventory = askGoodsMapper.getInventory(askGoods);
|
|
|
+ inventory = askGoodsMapper.getInventoryWarehousing(askGoods);
|
|
|
} else if(material.getPartType().equals("产成品")){
|
|
|
inventory = deliveryMapper.getInventoryHalf(askGoods);
|
|
|
} else if(material.getPartType().equals("半成品")){
|