|
|
@@ -71,7 +71,9 @@ public class DeliveryServiceImpl implements DeliveryService {
|
|
|
for(Inventory inventory : deliveryMapper.getInventory(storageLocationCode, delivery)){
|
|
|
int occupy = deliveryMapper.getVitrual(inventory);
|
|
|
if(occupy == 0){
|
|
|
- if(Double.doubleToLongBits(Double.parseDouble(inventory.getAmount())) == Double.doubleToLongBits(Double.parseDouble(delivery.getOutNum()))){
|
|
|
+ //--------------暂时使用 后期改回逻辑
|
|
|
+// if(Double.doubleToLongBits(Double.parseDouble(inventory.getAmount())) == Double.doubleToLongBits(Double.parseDouble(delivery.getOutNum()))){
|
|
|
+ if(Double.doubleToLongBits(Double.parseDouble(inventory.getAmount())) >= Double.doubleToLongBits(Double.parseDouble(delivery.getOutNum()))){
|
|
|
for(Inventory inventorys : deliveryMapper.getInventory(storageLocationCode, delivery)){
|
|
|
if (inventorys.getStorageLocationCode().equals(inventory.getStorageLocationCode())){
|
|
|
list.add(inventorys);
|
|
|
@@ -148,7 +150,7 @@ public class DeliveryServiceImpl implements DeliveryService {
|
|
|
|
|
|
//临时使用后期删除
|
|
|
//-------------------------------
|
|
|
- Inventory inventory = new Inventory();
|
|
|
+ Inventory inventory = null;
|
|
|
if(materialClass.getPartType().equals("产成品")){
|
|
|
inventory = deliveryMapper.getTemporarily(askGoods);
|
|
|
} else {
|
