Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/dk/mdm/service/ivt/TransferService.java

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

@@ -168,7 +168,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_transfer_item
+        FROM dkic_b.t_psi_transfer_item
         <include refid="Condition"/>
     </select>
 
@@ -184,7 +184,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_transfer_item
+        FROM dkic_b.t_psi_transfer_item
         WHERE item_id = #{itemId}
         for update
     </select>

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

@@ -25,6 +25,10 @@ import com.dk.mdm.model.query.ivt.CheckItemQuery;
 import com.dk.mdm.model.query.ivt.TransferItemQuery;
 import com.dk.mdm.model.query.ivt.TransferQuery;
 import com.dk.mdm.model.response.ivt.*;
+import com.dk.mdm.model.response.ivt.InboundItemResponse;
+import com.dk.mdm.model.response.ivt.InventoryResponse;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
+import com.dk.mdm.model.response.ivt.TransferResponse;
 import com.dk.mdm.model.vo.ivt.*;
 import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.ivt.inbound.InboundCheckService;
@@ -78,6 +82,9 @@ public class TransferService extends BaseService<Transfer> {
 	@Autowired
 	private OutboundItemService outboundItemService;
 
+	@Autowired
+	private InboundItemMapper inboundItemMapper;
+
 	/**
 	 * @desc   : 重写主键
 	 * @author : 宋扬
@@ -138,9 +145,6 @@ public class TransferService extends BaseService<Transfer> {
 			// 计算总调整量
 			BigDecimal transferQtySum = transferVO.getItemList().stream().map(TransferItemVO::getTransferQty).reduce(BigDecimal.ZERO, BigDecimal::add)
 					.setScale(6, BigDecimal.ROUND_HALF_UP);
-			// 计算总入库金额
-				/*BigDecimal intoingAmtSum = transferVO.getItemList().stream().map(TransferItemVO::getIntoingAmt).reduce(BigDecimal.ZERO, BigDecimal::add)
-						.setScale(6, BigDecimal.ROUND_HALF_UP);*/
 			// 获取入库表实体
 			InboundVO inboundVO = new InboundVO();
 			List<InboundItemVO> inboundItemVOList=new ArrayList<>();
@@ -204,10 +208,11 @@ public class TransferService extends BaseService<Transfer> {
 						// 在入库接口中获取入库明细数据
 						inboundItemVOList = inboundTransferVO.getItemList().stream()
 								.filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
-
+						// 查询入库明细，取InvId值
+						InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVOList.get(0).getItemId());
 						// 获取调整主表uuidhe
 						transferItem.setTransferId(transfer.getTransferId()).setTransferDate(LocalDate.now())
-								.setInvId(inboundItemVOList.get(0).getInvId()).setNonStdCode(transferItemVO.getONonStdCode());
+								.setInvId(inboundItemResponse.getInvId()).setNonStdCode(transferItemVO.getONonStdCode());
 						// 插入调整单明细数据
 						transferItemMapper.insert(transferItem);
 						// 赋值入库明细值 并修改入库明细from_item_id值
@@ -232,8 +237,8 @@ public class TransferService extends BaseService<Transfer> {
 				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());;
+						.setMakeTime(LocalDateTime.now()).setOutDate(LocalDate.now())
+						.setOutingAmt(BigDecimal.ZERO).setOutType(Constant.OutType.REMOVE.getName());
 				// 获取出库明细实体
 				for (TransferItemVO transferItemVO : transferVO.getItemList()) {
 					// 赋值出库明细信息。
@@ -241,7 +246,7 @@ public class TransferService extends BaseService<Transfer> {
 					outboundItemVO.setItemIndex(transferItemVO.getItemIndex()).setSkuId(transferItemVO.getSkuId())
 							.setOutingQty(transferItemVO.getTransferQty()).setFromId(transfer.getTransferId())
 							.setOutingAmt(BigDecimal.ZERO).setPriceOut(BigDecimal.ZERO).setInvId(transferItemVO.getOInvId())
-							.setWhId(transferItemVO.getWhId()).setNonStdCode(transferItemVO.getONonStdCode());
+							.setWhId(transferItemVO.getOWhId()).setNonStdCode(transferItemVO.getONonStdCode());
 					outboundItemVOList.add(outboundItemVO);
 				}
 				// 赋值出库接口参数 总表和明细
@@ -281,10 +286,11 @@ public class TransferService extends BaseService<Transfer> {
 						// 在入库接口中获取入库明细数据
 						inboundItemVOList = inboundTransferVO.getItemList().stream()
 								.filter(it -> it.getItemIndex().equals(transferItemVO.getItemIndex())).collect(Collectors.toList());
-
+						// 查询入库明细，取InvId值
+						InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVOList.get(0).getItemId());
 						// 获取调整主表uuid
 						transferItem.setTransferId(transfer.getTransferId()).setTransferDate(LocalDate.now())
-								.setInvId(inboundItemVOList.get(0).getInvId()).setWhId(transferItemVO.getOWhId());
+								.setInvId(inboundItemResponse.getInvId()).setWhId(transferItemVO.getOWhId());
 						// 插入调整单明细数据
 						transferItemMapper.insert(transferItem);
 						// 赋值入库明细值 并修改入库明细from_item_id值

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

@@ -1588,12 +1588,12 @@ public class InventoryService extends BaseService<Inventory> {
 
         //region 明细
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
-            List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery()
-                    .setItemId(inOutRecordVO.getBiznisItemId()));
-            InboundItemResponse inboundItemResponse = inboundItemResponses.get(0);
+           /* List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery()
+                    .setItemId(inOutRecordVO.getBiznisItemId()));*/
+
             InboundItem inboundItem = new InboundItem();
             //总单id
-            inboundItem.setItemId(inboundItemResponse.getItemId());
+            inboundItem.setItemId(inOutRecordVO.getBiznisItemId());
             //出库数量
             inboundItem.setOutQty(inOutRecordVO.getIntoQty().abs());
             //已入库数量
@@ -1608,7 +1608,7 @@ public class InventoryService extends BaseService<Inventory> {
             inboundItem.setInvId(inOutRecordVO.getInvId());
             inboundItemMapper.update(inboundItem,
                     new UpdateWrapper<InboundItem>().lambda()
-                            .eq(InboundItem::getIntoId, UUID.fromString(inboundItem.getItemId()))
+                            .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
             );
         }
         //endregion