出入库

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -140,7 +140,8 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                     .setIntoingAmt(BigDecimal.ZERO)
             ;
         } else {
-            inboundVO.setIntoQty(BigDecimal.ZERO)
+            inboundVO
+                    .setIntoQty(BigDecimal.ZERO)
                     .setIntoAmt(BigDecimal.ZERO)
             ;
         }
@@ -155,10 +156,20 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
             IntoReturn  intoReturn = new IntoReturn();
             intoReturn.setReturnId(inboundVO.getFromId());
+            //根据id查询
+            IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
             //已入库
             if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
-                intoReturn.setOutingQty(inboundVO.getIntoQty());
-                intoReturn.setOutingAmt(inboundVO.getIntoQty());
+                //第一次已入库
+                if(intoReturnResponse.getOutingQty().compareTo(inboundVO.getIntoingQty()) == 0){
+                    intoReturn.setOutingQty(BigDecimal.ZERO);
+                    intoReturn.setOutingAmt(BigDecimal.ZERO);
+                }
+                //多次已入库
+                else{
+                    intoReturn.setOutingQty(inboundVO.getIntoQty());
+                    intoReturn.setOutingAmt(inboundVO.getIntoQty());
+                }
                 intoReturn.setOutQty(inboundVO.getIntoQty().abs());
                 intoReturn.setOutAmt(inboundVO.getIntoQty().abs());
             }
@@ -166,9 +177,9 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             else{
                 intoReturn.setOutingQty(inboundVO.getIntoingQty().abs());
                 intoReturn.setOutingAmt(inboundVO.getIntoingAmt().abs());
+                intoReturn.setOutQty(BigDecimal.ZERO);
+                intoReturn.setOutAmt(BigDecimal.ZERO);
             }
-            //根据id查询
-            IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
             //入库状态
             String outStatus = this.setOutStatus(intoReturnResponse.getOutingQty().add(intoReturn.getOutingQty()),
                     intoReturnResponse.getOutQty().add(intoReturn.getOutQty()));
@@ -221,10 +232,20 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
                 IntoReturnItem intoReturnItem = new IntoReturnItem();
                 intoReturnItem.setItemId(inboundItemVO.getFromItemId());
+                //根据id查询
+                IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
                 //已入库
                 if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
-                    intoReturnItem.setOutingQty(inboundVO.getIntoQty());
-                    intoReturnItem.setOutingAmt(inboundVO.getIntoQty());
+                    //第一次已入库
+                    if(intoReturnItemResponse.getOutingQty().compareTo(BigDecimal.ZERO)==0){
+                        intoReturnItem.setOutingQty(BigDecimal.ZERO);
+                        intoReturnItem.setOutingAmt(BigDecimal.ZERO);
+                    }
+                    //多次已入库
+                    else{
+                        intoReturnItem.setOutingQty(inboundVO.getIntoQty());
+                        intoReturnItem.setOutingAmt(inboundVO.getIntoQty());
+                    }
                     intoReturnItem.setOutQty(inboundVO.getIntoQty().abs());
                     intoReturnItem.setOutAmt(inboundVO.getIntoQty().abs());
                 }
@@ -232,9 +253,9 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 else{
                     intoReturnItem.setOutingQty(inboundVO.getIntoingQty().abs());
                     intoReturnItem.setOutingAmt(inboundVO.getIntoingAmt().abs());
+                    intoReturnItem.setOutQty(BigDecimal.ZERO);
+                    intoReturnItem.setOutAmt(BigDecimal.ZERO);
                 }
-                //根据id查询
-                IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
                 //出库状态
                 String outStatus = this.setOutStatus(intoReturnItemResponse.getOutingQty().add(intoReturnItem.getOutingQty()),
                         intoReturnItemResponse.getOutQty().add(intoReturnItem.getOutQty()));

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -150,20 +150,30 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 			//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 			Purchase purchaseUpdate = new Purchase();
 			purchaseUpdate.setPurId(inboundVO.getFromId());
+			//根据id查询
+			PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
 			//已入库
 			if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
-				purchaseUpdate.setIntoingQty(inboundVO.getIntoQty().negate());
-				purchaseUpdate.setIntoingAmt(inboundVO.getIntoAmt().negate());
-				purchaseUpdate.setIntoAmt(inboundVO.getIntoAmt());
+				//直接已入库
+				if(purchaseResponse.getIntoingQty().compareTo(BigDecimal.ZERO)==0){
+					purchaseUpdate.setIntoingQty(BigDecimal.ZERO);
+					purchaseUpdate.setIntoingAmt(BigDecimal.ZERO);
+				}
+				//多次已入库
+				else{
+					purchaseUpdate.setIntoingQty(inboundVO.getIntoQty().negate());
+					purchaseUpdate.setIntoingAmt(inboundVO.getIntoAmt().negate());
+				}
 				purchaseUpdate.setIntoQty(inboundVO.getIntoQty());
+				purchaseUpdate.setIntoAmt(inboundVO.getIntoAmt());
 			}
 			//入库中
 			else{
 				purchaseUpdate.setIntoingQty(inboundVO.getIntoingQty());
 				purchaseUpdate.setIntoingAmt(inboundVO.getIntoingAmt());
+				purchaseUpdate.setIntoQty(BigDecimal.ZERO);
+				purchaseUpdate.setIntoAmt(BigDecimal.ZERO);
 			}
-			//根据id查询
-			PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
 			//入库状态
 			String intoStatus = this.setIntoStatus(purchaseResponse.getIntoingQty().add(purchaseUpdate.getIntoingQty()),
 					purchaseResponse.getIntoQty().add(purchaseUpdate.getIntoQty()));
@@ -216,10 +226,20 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 				//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 				PurchaseItem  purchaseItem = new PurchaseItem();
 				purchaseItem.setItemId(inboundItemVO.getFromItemId());
+				//根据id查询
+				PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemVO.getFromItemId());
 				//已入库
 				if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
-					purchaseItem.setIntoingQty(inboundItemVO.getIntoQty().negate());
-					purchaseItem.setIntoingAmt(inboundItemVO.getIntoAmt().negate());
+					//第一次已入库
+					if(purchaseItemResponse.getIntoingQty().compareTo(BigDecimal.ZERO)==0){
+						purchaseItem.setIntoingQty(BigDecimal.ZERO);
+						purchaseItem.setIntoingAmt(BigDecimal.ZERO);
+					}
+					//多次已入库
+					else{
+						purchaseItem.setIntoingQty(inboundItemVO.getIntoQty().negate());
+						purchaseItem.setIntoingAmt(inboundItemVO.getIntoAmt().negate());
+					}
 					purchaseItem.setIntoQty(inboundItemVO.getIntoQty());
 					purchaseItem.setIntoAmt(inboundItemVO.getIntoAmt());
 				}
@@ -227,9 +247,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 				else{
 					purchaseItem.setIntoingQty(inboundItemVO.getIntoQty());
 					purchaseItem.setIntoingAmt(inboundItemVO.getIntoAmt());
+					purchaseItem.setIntoQty(BigDecimal.ZERO);
+					purchaseItem.setIntoAmt(BigDecimal.ZERO);
 				}
-				//根据id查询
-				PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemVO.getFromItemId());
 				//入库状态
 				String intoStatus = this.setIntoStatus(purchaseItemResponse.getIntoingQty().add(purchaseItem.getIntoingQty()),
 						purchaseItemResponse.getIntoQty().add(purchaseItem.getIntoQty()));

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -153,10 +153,20 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
             Order order = new Order();
             order.setOrderId(outboundVO.getFromId());
+            //根据id查询
+            OrderResponse orderResponse = orderMapper.selectById(outboundVO.getFromId());
             //已出库
             if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())){
-                order.setOutingQty(outboundVO.getOutQty().negate());
-                order.setOutingAmt(outboundVO.getOutAmt().negate());
+                //第一次已出库
+                if(orderResponse.getOutingQty().compareTo(BigDecimal.ZERO)==0){
+                    order.setOutingQty(BigDecimal.ZERO);
+                    order.setOutingAmt(BigDecimal.ZERO);
+                }
+                //多次已出库
+                else{
+                    order.setOutingQty(outboundVO.getOutQty().negate());
+                    order.setOutingAmt(outboundVO.getOutAmt().negate());
+                }
                 order.setOutQty(outboundVO.getOutQty());
                 order.setOutAmt(outboundVO.getOutAmt());
             }
@@ -164,9 +174,10 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             else{
                 order.setOutingQty(outboundVO.getOutingQty());
                 order.setOutingAmt(outboundVO.getOutingAmt());
+                order.setOutQty(BigDecimal.ZERO);
+                order.setOutAmt(BigDecimal.ZERO);
             }
-            //根据id查询
-            OrderResponse orderResponse = orderMapper.selectById(outboundVO.getFromId());
+
             //入库状态
             String outStatus = this.setOutStatus(orderResponse.getOutingQty().add(order.getOutingQty()), orderResponse.getOutQty().add(order.getOutQty()));
             order.setOutStatus(outStatus);
@@ -218,10 +229,19 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
                 OrderItem orderItem = new OrderItem();
                 orderItem.setItemId(outboundItemVO.getFromItemId());
+                //根据id查询
+                OrderItemResponse orderItemResponse = orderItemMapper.selectById(outboundItemVO.getFromItemId());
                 //已出库
                 if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())){
-                    orderItem.setOutingQty(outboundVO.getOutQty().negate());
-                    orderItem.setOutingAmt(outboundVO.getOutAmt().negate());
+                    if(orderItemResponse.getOutingQty().compareTo(BigDecimal.ZERO)==0){
+                        orderItem.setOutingQty(BigDecimal.ZERO);
+                        orderItem.setOutingAmt(BigDecimal.ZERO);
+                    }
+                    //多次已出库
+                    else{
+                        orderItem.setOutingQty(outboundVO.getOutQty().negate());
+                        orderItem.setOutingAmt(outboundVO.getOutAmt().negate());
+                    }
                     orderItem.setOutQty(outboundVO.getOutQty());
                     orderItem.setOutAmt(outboundVO.getOutAmt());
                 }
@@ -229,9 +249,9 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
                 else{
                     orderItem.setOutingQty(outboundVO.getOutingQty());
                     orderItem.setOutingAmt(outboundVO.getOutingAmt());
+                    orderItem.setOutQty(BigDecimal.ZERO);
+                    orderItem.setOutAmt(BigDecimal.ZERO);
                 }
-                //根据id查询
-                OrderItemResponse orderItemResponse = orderItemMapper.selectById(outboundItemVO.getFromItemId());
                 //入库状态
                 String outStatus = this.setOutStatus(orderItemResponse.getOutingQty().add(orderItem.getOutingQty()), orderItemResponse.getOutQty().add(orderItem.getOutQty()));
                 orderItem.setOutStatus(outStatus);

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -153,10 +153,20 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
             OutReturn outReturn = new OutReturn();
             outReturn.setReturnId(outboundVO.getFromId());
+            //根据id查询
+            OutReturnResponse outReturnResponse = outReturnMapper.selectById(outboundVO.getFromId());
             //已出库
             if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
-                outReturn.setIntoingQty(outboundVO.getOutQty());
-                outReturn.setIntoingAmt(outboundVO.getOutQty());
+                //第一次已出库
+                if(outReturnResponse.getIntoingQty().compareTo(BigDecimal.ZERO)==0){
+                    outReturn.setIntoingQty(BigDecimal.ZERO);
+                    outReturn.setIntoingAmt(BigDecimal.ZERO);
+                }
+                //多次已出库
+                else{
+                    outReturn.setIntoingQty(outboundVO.getOutQty());
+                    outReturn.setIntoingAmt(outboundVO.getOutQty());
+                }
                 outReturn.setIntoQty(outboundVO.getOutQty().abs());
                 outReturn.setIntoAmt(outboundVO.getOutAmt().abs());
             }
@@ -164,9 +174,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             else {
                 outReturn.setIntoingQty(outboundVO.getOutingQty().abs());
                 outReturn.setIntoingAmt(outboundVO.getOutingAmt().abs());
+                outReturn.setIntoQty(BigDecimal.ZERO);
+                outReturn.setIntoAmt(BigDecimal.ZERO);
             }
-            //根据id查询
-            OutReturnResponse outReturnResponse = outReturnMapper.selectById(outboundVO.getFromId());
             //入库状态
             String intoStatus = this.setIntoStatus(outReturnResponse.getIntoQty().add(outReturn.getIntoingQty()),
                     outReturnResponse.getIntoQty().add(outReturn.getIntoQty()));
@@ -219,12 +229,30 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
                 //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
                 OutReturnItem outReturnItem = new OutReturnItem();
                 outReturnItem.setItemId(outboundItemVO.getFromItemId());
-                outReturnItem.setIntoQty(outboundItemVO.getOutQty().abs());
-                outReturnItem.setIntoAmt(outboundItemVO.getOutAmt().abs());
-                outReturnItem.setIntoingQty(outboundItemVO.getOutingQty().abs());
-                outReturnItem.setIntoingAmt(outboundItemVO.getOutingAmt().abs());
                 //根据id查询
                 OutReturnItemResponse outReturnItemResponse = outReturnItemMapper.selectById(outboundItemVO.getFromItemId());
+                //已出库
+                if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
+                    //第一次已出库
+                    if(outReturnItemResponse.getIntoingQty().compareTo(BigDecimal.ZERO)==0){
+                        outReturnItem.setIntoingQty(BigDecimal.ZERO);
+                        outReturnItem.setIntoingAmt(BigDecimal.ZERO);
+                    }
+                    //多次已出库
+                    else{
+                        outReturnItem.setIntoingQty(outboundVO.getOutQty());
+                        outReturnItem.setIntoingAmt(outboundVO.getOutQty());
+                    }
+                    outReturnItem.setIntoQty(outboundVO.getOutQty().abs());
+                    outReturnItem.setIntoAmt(outboundVO.getOutAmt().abs());
+                }
+                //出库中
+                else {
+                    outReturnItem.setIntoingQty(outboundVO.getOutingQty().abs());
+                    outReturnItem.setIntoingAmt(outboundVO.getOutingAmt().abs());
+                    outReturnItem.setIntoQty(BigDecimal.ZERO);
+                    outReturnItem.setIntoAmt(BigDecimal.ZERO);
+                }
                 //入库状态
                 String intoStatus = this.setIntoStatus(outReturnItemResponse.getIntoingQty().add(outReturnItem.getIntoingQty()),
                         outReturnItemResponse.getIntoQty().add(outReturnItem.getIntoQty()));