|
@@ -101,7 +101,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
//如果出库库存等于虚拟表库存则删除此库存
|
|
//如果出库库存等于虚拟表库存则删除此库存
|
|
- if(Integer.parseInt(askGoods.getNum()) == Integer.parseInt(inventory.getAmount())){
|
|
|
|
|
|
+ if(Double.doubleToLongBits(Double.parseDouble(askGoods.getNum())) == Double.doubleToLongBits(Double.parseDouble(inventory.getAmount()))){
|
|
askGoodsMapper.deleteInventory(inventory);
|
|
askGoodsMapper.deleteInventory(inventory);
|
|
} else {
|
|
} else {
|
|
inventory.setAmount(askGoods.getNum());
|
|
inventory.setAmount(askGoods.getNum());
|
|
@@ -130,7 +130,12 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
askGoods.setStorageLocationCode(askGoods.getStorageLocationCode());
|
|
askGoods.setStorageLocationCode(askGoods.getStorageLocationCode());
|
|
askGoodsMapper.addRemoval(askGoods);//插入出库流水
|
|
askGoodsMapper.addRemoval(askGoods);//插入出库流水
|
|
askGoodsMapper.deleteVirtual(askGoods.getId());//删除已出虚拟表库存
|
|
askGoodsMapper.deleteVirtual(askGoods.getId());//删除已出虚拟表库存
|
|
- warehouseTransferMapper.updateOutNum(askGoods.getNum(), askGoodsId, materialId);//修改出库数量
|
|
|
|
|
|
+ Double scanNum = Double.parseDouble(warehouseTransfer.getOutNum()) + Double.parseDouble(askGoods.getNum());
|
|
|
|
+ String typeVal = "0";
|
|
|
|
+ if(Double.doubleToLongBits(scanNum) == Double.doubleToLongBits(Double.parseDouble(warehouseTransfer.getNum()))){
|
|
|
|
+ typeVal = "1";
|
|
|
|
+ }
|
|
|
|
+ warehouseTransferMapper.updateOutNum(askGoods.getNum(), askGoodsId, materialId, typeVal);//修改出库数量
|
|
if(askGoods.getStorageLocationCodeRk().indexOf("XNKW") != -1){
|
|
if(askGoods.getStorageLocationCodeRk().indexOf("XNKW") != -1){
|
|
Inventory inventory2 = warehouseTransferMapper.getInventoryVitrual(askGoods);
|
|
Inventory inventory2 = warehouseTransferMapper.getInventoryVitrual(askGoods);
|
|
if(inventory2 != null ){
|
|
if(inventory2 != null ){
|
|
@@ -215,7 +220,12 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
warehousingVirtual.setMaterialId(warehousingVirtual1.getMaterialId());
|
|
warehousingVirtual.setMaterialId(warehousingVirtual1.getMaterialId());
|
|
warehousingVirtual.setStorageCode(warehouseTransferCode);
|
|
warehousingVirtual.setStorageCode(warehouseTransferCode);
|
|
list.add(warehousingVirtual);
|
|
list.add(warehousingVirtual);
|
|
- warehouseTransferMapper.updateOutNum(warehousingVirtual.getNum(), warehousingVirtual.getWarehouseTransferId(), materialId);//修改出库数量
|
|
|
|
|
|
+ Double scanNum = Double.parseDouble(warehouseTransfer.getOutNum()) + Double.parseDouble(warehousingVirtual.getNum());
|
|
|
|
+ String typeVal = "0";
|
|
|
|
+ if(Double.doubleToLongBits(scanNum) == Double.doubleToLongBits(Double.parseDouble(warehouseTransfer.getNum()))){
|
|
|
|
+ typeVal = "1";
|
|
|
|
+ }
|
|
|
|
+ warehouseTransferMapper.updateOutNum(warehousingVirtual.getNum(), warehousingVirtual.getWarehouseTransferId(), materialId, typeVal);//修改出库数量
|
|
|
|
|
|
AskGoods askGoods = new AskGoods()
|
|
AskGoods askGoods = new AskGoods()
|
|
.setStorageLocationCode(warehousingVirtual.getStorageLocationCodeCk())
|
|
.setStorageLocationCode(warehousingVirtual.getStorageLocationCodeCk())
|
|
@@ -240,7 +250,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
|
|
inventory = askGoodsMapper.getInventoryWarehousing(askGoods);
|
|
inventory = askGoodsMapper.getInventoryWarehousing(askGoods);
|
|
}
|
|
}
|
|
//如果出库库存等于虚拟表库存则删除此库存
|
|
//如果出库库存等于虚拟表库存则删除此库存
|
|
- if(Integer.parseInt(askGoods.getNum()) == Integer.parseInt(inventory.getAmount())){
|
|
|
|
|
|
+ if(Double.doubleToLongBits(Double.parseDouble(askGoods.getNum())) == Double.doubleToLongBits(Double.parseDouble(inventory.getAmount()))){
|
|
askGoodsMapper.deleteInventory(inventory);
|
|
askGoodsMapper.deleteInventory(inventory);
|
|
} else {
|
|
} else {
|
|
inventory.setAmount(askGoods.getNum());
|
|
inventory.setAmount(askGoods.getNum());
|