退货的保存

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

@@ -225,6 +225,18 @@ public class InOutRecordVO  {
     @ApiModelProperty(value = "外协供应商Id")
     private String supId;
 
+    @ApiModelProperty(value = "部门Id")
+    private String orgId;
+
+    @ApiModelProperty(value = "业务员Id")
+    private String staffId;
+    /**
+     * 制单员
+     */
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
+
 
 
 

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

@@ -313,6 +313,17 @@ public class OutboundItemVO {
     @ApiModelProperty(value = "不够库存数量----新建出库中数量")
     private BigDecimal notEnoughInventoryQty;
 
+    @ApiModelProperty(value = "部门Id")
+    private String orgId;
+
+    @ApiModelProperty(value = "业务员Id")
+    private String staffId;
+    /**
+     * 制单员
+     */
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
 
 
 

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

@@ -1342,6 +1342,12 @@ public class InventoryService extends BaseService<Inventory> {
                     setIntoNo(codeMap.get("outNote").toString());
             //入库类型
             inbound.setIntoType(Constant.IntoType.OTHER.getName());
+            //部门Id
+            inbound.setOrgId(inOutRecordVOList.get(0).getOrgId());
+            //业务员Id
+            inbound.setStaffId(inOutRecordVOList.get(0).getStaffId());
+            // 制单员
+            inbound.setMakeStaff(inOutRecordVOList.get(0).getMakeStaff());
             //已入库
             inbound.setIntoStatus(Constant.IntoStatus.YIRUKU.getName());
             //已入库数量
@@ -1371,6 +1377,10 @@ public class InventoryService extends BaseService<Inventory> {
                 inboundItem.setFromId(inOutRecordVOList.get(0).getBiznisId());
                 //来源明细
                 inboundItem.setFromItemId(inOutRecordVOList.get(0).getBiznisItemId());
+//                出库商品顺序
+                inboundItem.setItemIndex(inOutRecordVOList.get(0).getItemIndex());
+                // 入库价
+                inboundItem.setPriceInto(inOutRecordVOList.get(0).getPriceInto());
                 //实体转换
                 inboundItemMapper.insert(inboundItem);
                 inOutRecordVO.setIntoId(inbound.getIntoId());

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

@@ -404,6 +404,10 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
             outboundItemVO.setInventoryType(Constant.InventoryType.OUTBOUND.getName());
             outboundItemVO.setInventoryDocCode(Constant.InventoryDocCode.SALE_RETURN.getValue());
             outboundItemVO.setAddOrEditFlag(true);
+            outboundItemVO.setOrgId(outboundVO.getOrgId());
+            outboundItemVO.setStaffId(outboundVO.getStaffId());
+            outboundItemVO.setMakeStaff(outboundVO.getMakeStaff());
+
             //endregion
 
             //region  新建明细