Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.java

@@ -79,7 +79,7 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      * @date   : 2024/3/18 13:41
      * @author : 寇珊珊
      */
-    OutboundItemResponse selectItemIndex(@Param("itemIndex") Integer itemIndex);
+    OutboundItemResponse selectItemIndex(@Param("itemIndex") Integer itemIndex,@Param("id") String id);
 
     /**
      * @desc   : 修改退货信息

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -610,6 +610,7 @@
         <include refid="Base_Column_List_Response"/>
         FROM dkic_b.t_psi_outbound_item tpoi
         WHERE tpoi.item_index = #{itemIndex}
+             and tpoi.out_id=#{id}::uuid
     </select>
 
 

src/main/java/com/dk/mdm/model/vo/ivt/InOutRecordVO.java

@@ -216,7 +216,7 @@ public class InOutRecordVO  {
     private String biznisNo;
 
     @ApiModelProperty(value = "出库商品顺序-库存调整给入库价")
-    private Integer outItemIndex;
+    private Integer itemIndex;
 
 
 

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -238,7 +238,12 @@ public class InboundItemVO  {
 
     @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
     private Boolean addOrEditFlag;
-
+    /**
+     * 出库ID
+     */
+    @ApiModelProperty(value = "出库ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String outId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/ivt/TransferService.java

@@ -149,37 +149,20 @@ public class TransferService extends BaseService<Transfer> {
 			List<OutboundItemVO> outboundItemVOList=new ArrayList<>();
 			// 仓库调整
 			if(transferVO.getTransferType().equals(Constant.transferType.CHECK_TYPE_WH.getName())) {
-				// 赋值入库实体
-				inboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
-						.setMakeStaff(transferVO.getMakeStaff()).setIntoingQty(transferQtySum)
-						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
-						.setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(transferVO.getWhId())
-						.setFlgAutoHandle(true).setIntoingAmt(BigDecimal.ZERO)
-						.setIntoType(Constant.IntoType.REMOVE.getName());
 				// 赋值出库实体
 				outboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
 						.setMakeStaff(transferVO.getMakeStaff()).setOutingQty(transferQtySum)
 						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
 						.setMakeTime(LocalDateTime.now()).setOutDate(LocalDate.now())
 						.setOutingAmt(BigDecimal.ZERO).setOutType(Constant.OutType.REMOVE.getName());
-				// 获取入库明细实体
+				// 获取出库明细实体
 				for (TransferItemVO transferItemVO : transferVO.getItemList()) {
-					// 赋值入库明细实体
-					InboundItemVO inboundItemVO=new InboundItemVO();
-					inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
-							.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
-							.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO)
-							.setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
-
-					inboundItemVOList.add(inboundItemVO);
-
 					// 赋值出库明细信息。
 					OutboundItemVO outboundItemVO =new OutboundItemVO();
 					outboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
 							.setOutingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
 							.setOutingAmt(BigDecimal.ZERO).setPriceOut(BigDecimal.ZERO).setInvId(transferItemVO.getOInvId())
 							.setWhId(transferItemVO.getOWhId()).setNonStdCode(transferItemVO.getONonStdCode());
-
 					outboundItemVOList.add(outboundItemVO);
 				}
 
@@ -189,6 +172,25 @@ public class TransferService extends BaseService<Transfer> {
 				// 调用盘点出库接口
 				OutboundVO outboundTransferVO = outboundCheckService.otherOutboundInsert(outboundCheckMap);
 
+				// 赋值入库实体
+				inboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
+						.setMakeStaff(transferVO.getMakeStaff()).setIntoingQty(transferQtySum)
+						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
+						.setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(transferVO.getWhId())
+						.setFlgAutoHandle(true).setIntoingAmt(BigDecimal.ZERO)
+						.setIntoType(Constant.IntoType.REMOVE.getName());
+
+				// 获取入库明细实体
+				for (TransferItemVO transferItemVO : transferVO.getItemList()) {
+					// 赋值入库明细实体
+					InboundItemVO inboundItemVO=new InboundItemVO();
+					inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+							.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+							.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO).setOutId(outboundTransferVO.getOutId())
+							.setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
+					inboundItemVOList.add(inboundItemVO);
+				}
+
 				// 赋值入库接口参数 总表和明细
 				inboundMap.put("total", inboundVO);
 				inboundMap.put("detail", inboundItemVOList);
@@ -226,29 +228,14 @@ public class TransferService extends BaseService<Transfer> {
 			}
 			// 非标号调整
 			else{
-				// 赋值入库实体
-				inboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
-						.setMakeStaff(transferVO.getMakeStaff()).setIntoingQty(transferQtySum)
-						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
-						.setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(transferVO.getOWhId())
-						.setFlgAutoHandle(true).setIntoingAmt(BigDecimal.ZERO)
-						.setIntoType(Constant.IntoType.REMOVE.getName());
 				// 赋值出库实体
 				outboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
 						.setMakeStaff(transferVO.getMakeStaff()).setOutingQty(transferQtySum)
 						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
 						.setMakeTime(LocalDateTime.now()).setOutDate(LocalDate.now()).setOutingAmt(BigDecimal.ZERO)
 						.setOutType(Constant.OutType.REMOVE.getName());;
-				// 获取入库明细实体
+				// 获取出库明细实体
 				for (TransferItemVO transferItemVO : transferVO.getItemList()) {
-					// 赋值入库明细实体
-					InboundItemVO inboundItemVO=new InboundItemVO();
-					inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
-							.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
-							.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO)
-							.setWhId(transferItemVO.getOWhId()).setNonStdCode(transferItemVO.getNonStdCode());
-					inboundItemVOList.add(inboundItemVO);
-
 					// 赋值出库明细信息。
 					OutboundItemVO outboundItemVO =new OutboundItemVO();
 					outboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
@@ -263,6 +250,24 @@ public class TransferService extends BaseService<Transfer> {
 				// 调用盘点出库接口
 				OutboundVO outboundTransferVO = outboundCheckService.otherOutboundInsert(outboundCheckMap);
 
+				// 赋值入库实体
+				inboundVO.setOrgId(transferVO.getOrgId()).setStaffId(transferVO.getStaffId())
+						.setMakeStaff(transferVO.getMakeStaff()).setIntoingQty(transferQtySum)
+						.setFromId(transfer.getTransferId()).setFromNo(transfer.getTransferNo())
+						.setMakeTime(LocalDateTime.now()).setIntoDate(LocalDate.now()).setWhId(transferVO.getOWhId())
+						.setFlgAutoHandle(true).setIntoingAmt(BigDecimal.ZERO)
+						.setIntoType(Constant.IntoType.REMOVE.getName());
+
+				// 获取入库明细实体
+				for (TransferItemVO transferItemVO : transferVO.getItemList()) {
+					// 赋值入库明细实体
+					InboundItemVO inboundItemVO=new InboundItemVO();
+					inboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
+							.setIntoingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
+							.setIntoingAmt(BigDecimal.ZERO).setPriceInto(BigDecimal.ZERO).setOutId(outboundTransferVO.getOutId())
+							.setWhId(transferItemVO.getOWhId()).setNonStdCode(transferItemVO.getNonStdCode());
+					inboundItemVOList.add(inboundItemVO);
+				}
 				// 赋值入库接口参数 总表和明细
 				inboundMap.put("total", inboundVO);
 				inboundMap.put("detail", inboundItemVOList);

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

@@ -342,7 +342,6 @@ public class InventoryService extends BaseService<Inventory> {
                     this.updateOutbound(outList);
                 } else if (outDetail.size() == 0 && intoDetail.size() == 0 ) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.NO_DATA_MOVED_OUT.getMessage());
-
                 }
                 //后入
                 if (intoDetail.size() > 0) {
@@ -1565,28 +1564,6 @@ public class InventoryService extends BaseService<Inventory> {
     }
 
     /**
-     * @desc : 根据来源id和来源明细id查找出库单获取单价，金额等信息
-     * @date : 2024/4/16 10:19
-     * @author : 寇珊珊
-     */
-    @Transactional(
-            rollbackFor = {Exception.class}
-    )
-    public List<InOutRecordVO> selectOutbound(List<InOutRecordVO> inOutRecordVOList) {
-        for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
-            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectItemIndex(inOutRecordVO.getOutItemIndex());
-            //单价
-            inOutRecordVO.setPriceInto(outboundItemResponse.getPriceOut());
-            //金额
-            inOutRecordVO.setIntoAmt(outboundItemResponse.getOutAmt());
-            //成本单价
-            inOutRecordVO.setCostPrice(outboundItemResponse.getCostPrice());
-        }
-
-        return inOutRecordVOList;
-    }
-
-    /**
      * @desc : 修改入库单---单价、金额、成本等信息
      * @date : 2024/4/16 10:18
      * @author : 寇珊珊
@@ -1638,6 +1615,28 @@ public class InventoryService extends BaseService<Inventory> {
     }
 
     /**
+     * @desc : 根据来源id和来源明细id查找出库单获取单价，金额等信息
+     * @date : 2024/4/16 10:19
+     * @author : 寇珊珊
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public List<InOutRecordVO> selectOutbound(List<InOutRecordVO> inOutRecordVOList) {
+        for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
+            OutboundItemResponse outboundItemResponse = outboundItemMapper.selectItemIndex(inOutRecordVO.getItemIndex(),inOutRecordVO.getOutId());
+            //单价
+            inOutRecordVO.setPriceInto(outboundItemResponse.getPriceOut());
+            //金额
+            inOutRecordVO.setIntoAmt(outboundItemResponse.getOutAmt());
+            //成本单价
+            inOutRecordVO.setCostPrice(outboundItemResponse.getCostPrice());
+        }
+
+        return inOutRecordVOList;
+    }
+
+    /**
      * @desc : 调整仓库-入库删除
      * @date : 2024/4/10 13:09
      * @author : 寇珊珊