|
|
@@ -1423,8 +1423,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
purchase.setPurId(fromId);
|
|
|
purchase.setIntoQty(purchaseSumQty);
|
|
|
purchase.setIntoAmt(purchaseSumAmt);
|
|
|
- purchase.setIntoingAmt(updatePurchaseIntoingQty.negate());
|
|
|
- purchase.setIntoingQty(updatePurchaseIntoingAmt.negate());
|
|
|
+ purchase.setIntoingAmt(updatePurchaseIntoingAmt.negate());
|
|
|
+ purchase.setIntoingQty(updatePurchaseIntoingQty.negate());
|
|
|
//入库状态
|
|
|
String purIntoStatus = this.setIntoStatus(purchaseResponse.getIntoingQty().add(purchase.getIntoingQty()),
|
|
|
purchaseResponse.getIntoQty().add(purchase.getIntoQty()), purchaseResponse.getSumQuantity());
|
|
|
@@ -1792,8 +1792,14 @@ public class InboundPurchaseService extends BaseService<Inbound> {
|
|
|
}
|
|
|
//已入库 数量>0 入库中数量=0
|
|
|
else if (intoQty.compareTo(BigDecimal.ZERO) > 0 && intoingQty.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
- //已入库
|
|
|
- intoStatus = Constant.IntoStatus.YIRUKU.getName();
|
|
|
+ if (sumQty.compareTo(intoQty.add(intoingQty)) == 0) {
|
|
|
+ //已入库
|
|
|
+ intoStatus = Constant.IntoStatus.YIRUKU.getName();
|
|
|
+ } else {
|
|
|
+ //入库中
|
|
|
+ intoStatus = Constant.IntoStatus.RUKUZHONG.getName();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
return intoStatus;
|
|
|
}
|
