出入库

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

@@ -155,10 +155,18 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
             //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
             IntoReturn  intoReturn = new IntoReturn();
             intoReturn.setReturnId(inboundVO.getFromId());
-            intoReturn.setOutingQty(inboundVO.getIntoingQty().negate());
-            intoReturn.setOutingAmt(inboundVO.getIntoingAmt().negate());
-            intoReturn.setOutQty(inboundVO.getIntoQty());
-            intoReturn.setOutAmt(inboundVO.getIntoQty());
+            //已入库
+            if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
+                intoReturn.setOutingQty(inboundVO.getIntoQty());
+                intoReturn.setOutingAmt(inboundVO.getIntoQty());
+                intoReturn.setOutQty(inboundVO.getIntoQty().abs());
+                intoReturn.setOutAmt(inboundVO.getIntoQty().abs());
+            }
+            //入库中
+            else{
+                intoReturn.setOutingQty(inboundVO.getIntoingQty().abs());
+                intoReturn.setOutingAmt(inboundVO.getIntoingAmt().abs());
+            }
             //根据id查询
             IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
             //入库状态
@@ -213,10 +221,18 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                 //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
                 IntoReturnItem intoReturnItem = new IntoReturnItem();
                 intoReturnItem.setItemId(inboundItemVO.getFromItemId());
-                intoReturnItem.setOutQty(inboundItemVO.getIntoQty().abs());
-                intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt().abs());
-                intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty().abs());
-                intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt().abs());
+                //已入库
+                if(Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())){
+                    intoReturnItem.setOutingQty(inboundVO.getIntoQty());
+                    intoReturnItem.setOutingAmt(inboundVO.getIntoQty());
+                    intoReturnItem.setOutQty(inboundVO.getIntoQty().abs());
+                    intoReturnItem.setOutAmt(inboundVO.getIntoQty().abs());
+                }
+                //入库中
+                else{
+                    intoReturnItem.setOutingQty(inboundVO.getIntoingQty().abs());
+                    intoReturnItem.setOutingAmt(inboundVO.getIntoingAmt().abs());
+                }
                 //根据id查询
                 IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
                 //出库状态

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

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

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -1,13 +1,21 @@
 package com.dk.mdm.service.ivt.inventory;
 
+import com.dk.common.response.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inventory;
 import com.dk.mdm.mapper.ivt.InventoryMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.vo.ivt.InventoryVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+/**
+ * @desc   : 库存明细
+ * @date   : 2024/3/20 13:41
+ * @author : 寇珊珊
+ */
 @Service
 @Transactional
 public class InventoryService extends BaseService<Inventory> {
@@ -19,5 +27,20 @@ public class InventoryService extends BaseService<Inventory> {
 
 	@Autowired
 	private InventoryMapper inventoryMapper;
+	
+	
+	/**
+	 * @desc   : 新建
+	 * @date   : 2024/3/20 13:46
+	 * @author : 寇珊珊
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> insertInbound(InventoryVO inventoryVO) {
+		//1.判断库存数据是否存在，存在更细，不存在新建
+
+		return ResponseResultUtil.success();
+	}
 
 }

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

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

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

@@ -153,10 +153,18 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
             OutReturn outReturn = new OutReturn();
             outReturn.setReturnId(outboundVO.getFromId());
-            outReturn.setIntoingQty(outboundVO.getOutingQty().abs());
-            outReturn.setIntoingAmt(outboundVO.getOutingAmt().abs());
-            outReturn.setIntoQty(outboundVO.getOutQty().abs());
-            outReturn.setIntoAmt(outboundVO.getOutAmt().abs());
+            //已出库
+            if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
+                outReturn.setIntoingQty(outboundVO.getOutQty());
+                outReturn.setIntoingAmt(outboundVO.getOutQty());
+                outReturn.setIntoQty(outboundVO.getOutQty().abs());
+                outReturn.setIntoAmt(outboundVO.getOutAmt().abs());
+            }
+            //出库中
+            else {
+                outReturn.setIntoingQty(outboundVO.getOutingQty().abs());
+                outReturn.setIntoingAmt(outboundVO.getOutingAmt().abs());
+            }
             //根据id查询
             OutReturnResponse outReturnResponse = outReturnMapper.selectById(outboundVO.getFromId());
             //入库状态