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

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -121,6 +121,18 @@ public class StaffController {
     }
 
     /**
+     * @desc : 注册商户时候插入  角色 基础资料（仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因） 计量单位 种类  打印票据  等等。
+     *         返回角色的数据
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "注册商户时候插入基础信息", notes = "注册商户时候插入基础信息")
+    @PostMapping({"insert_feign_company_data"})
+    public ResponseResultVO<?> insertFeignCompanyData(@RequestBody Map<String, List<Map<String, Object>>> map) {
+        return staffService.insertFeignCompanyData(map);
+    }
+
+    /**
      * @desc : 编辑员工
      * @author : 姜永辉
      * @date : 2023/1/9 10:49

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -247,6 +247,7 @@
     <!-- 获取角色 -->
     <select id="getRole" resultType="java.util.Map">
         select role_Id    AS "roleId",
+               role_code  AS "roleCode",
                role_name  AS "roleName",
                display_no AS "displayNo",
                remarks
@@ -466,6 +467,7 @@
         tmgs.sku_model         as "skuModel",
         tmgs.brand_id          as "brandId",
         tmgb.brand_name        as "brandName",
+        tmgb.short_name        as "shortName",
         tmgs.category_id       as "categoryId",
         tmgc.cat_name          as "categoryName",
         tmgs.unit_id           as "unitId",

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

@@ -83,6 +83,7 @@
         <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
         <result column="cost_price" property="costPrice"/>
         <result column="cost_amt" property="costAmt"/>
+        <result column="brandName" property="brandName"/>
         <result column="out_qty" property="outQty"/>
         <result column="inv_qty" property="invQty"/>
         <result column="flg_valid" property="flgValid"/>
@@ -124,7 +125,7 @@
         <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
-
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="sIntoItemIntoingQty" property="sIntoItemIntoingQty"/>
         <result column="sIntoItemIntoingAmt" property="sIntoItemIntoingAmt"/>
         <result column="sIntoItemIntoQty" property="sIntoItemIntoQty"/>
@@ -470,6 +471,7 @@
         ,tmgs.sku_model as "skuModel"
         ,tmgs.sku_name  as "skuName"
         ,tmgs.sku_spec  as "skuSpec"
+        ,tmgs.sku_images
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
         ,tmw.wh_id as "whId"

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

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

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

@@ -92,9 +92,13 @@
         <result column="s_order_id" property="sOrderId" typeHandler="UuidTypeHandler"/>
         <result column="s_order_item_id" property="sOrderItemId" typeHandler="UuidTypeHandler"/>
         <result column="skuCode" property="skuCode"/>
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="skuModel" property="skuModel"/>
         <result column="skuName" property="skuName"/>
         <result column="brandName" property="brandName"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="shortName" property="shortName"/>
+        <result column="short_name" property="shortName"/>
         <result column="orderQty" property="orderQty"/>
         <result column="canOutingQty" property="canOutingQty"/>
         <result column="whId" property="whId"/>
@@ -341,12 +345,15 @@
                tpo.order_no AS  "fromNo",
                t.item_index,
                t.sku_id,
+               tmgs.sku_images,
+
                tmgs.sku_code                                                             as "skuCode",
                tmgs.sku_model                                                            as "skuModel",
                tmgs.sku_name                                                             as "skuName",
                tpoi.item_qty                                                             as "orderQty",
                tpoi.item_qty - tpoi.outing_qty - tpoi.out_qty + t.outing_qty + t.out_qty as "canOutingQty",
                tmgb.brand_name AS "brandName",
+               tmgb.short_name AS "shortName",
                t.price_out,
                t.outing_qty + t.out_qty                                                  as outing_qty,
                t.outing_amt + t.out_amt                                                  as outing_amt,
@@ -440,6 +447,9 @@
                t.s_order_item_id,
                t.item_index,
                t.sku_id,
+               tmgs.sku_images,
+               tmgb.brand_name,
+               tmgb.short_name,
                tmgs.sku_code                                                                         as "skuCode",
                tmgs.sku_model                                                                        as "skuModel",
                tmgs.sku_name                                                                         as "skuName",
@@ -457,6 +467,7 @@
                t.remarks
         FROM dkic_b.t_psi_outbound_item as t
                  left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
+                 left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_psi_inventory tpi on tpi.inv_id = t.inv_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = tpi.wh_id
                  left join dkic_b.t_psi_outbound_item as tpobi on tpobi.item_id = t.s_out_item_id
@@ -597,4 +608,15 @@
     </update>
 
 
+    <!-- 根据商品顺序查询表t_psi_outbound_item的一行数据 -->
+    <select id="selectItemIndex" resultMap="BaseResultMapResponse">
+        SELECT
+        <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>
+
+
+
 </mapper>

src/main/java/com/dk/mdm/mapper/mac/MacTransferMapper.xml

@@ -83,6 +83,25 @@
             <if test="flgValidList != null and flgValidList.size()>0">
                 AND t.flg_valid =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
             </if>
+            <if test="searchText !=null">
+                AND   t.trf_no LIKE concat('%',my_ex.likequery(#{searchText}), '%')
+            </if>
+            <if test="orgName !=null">
+                AND   tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}), '%')
+            </if>
+            <if test="staffName !=null">
+                AND   tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}), '%')
+            </if>
+            <if test="trfOutMacName !=null">
+                AND   tmmaout.mac_name LIKE concat('%',my_ex.likequery(#{trfOutMacName}), '%')
+            </if>
+            <if test="trfInMacName !=null">
+                AND   tmmain.mac_name LIKE concat('%',my_ex.likequery(#{trfInMacName}), '%')
+            </if>
+            <if test="accDateStart != null and accDateEnd != null">
+                AND t.acc_date &gt;= #{accDateStart}::timestamp with time zone
+                AND t.acc_date &lt; #{accDateEnd}::timestamp with time zone + interval '1 day'
+            </if>
         </where>
     </sql>
 
@@ -113,10 +132,17 @@
                tms.staff_name       as "staffName",
                makestaff.staff_name as "makeStaffName"
         FROM dkic_b.t_mac_transfer as t
-                 left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
-                 left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
-        <include refid="Condition"/>
+                left join dkic_b.t_mac_transfer_item tmti ON t.trf_id = tmti.trf_id
+                left join dkic_b.t_mst_money_account tmmain ON tmti.trf_in_mac = tmmain.mac_id
+                left join dkic_b.t_mst_money_account tmmaout ON tmti.trf_out_mac = tmmaout.mac_id
+                left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+                left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
+                left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
+       <include refid="Condition"/>
+        GROUP BY  T .trf_id ,
+        tmo.org_name  ,
+        tms.staff_name   ,
+        makestaff.staff_name
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -126,9 +152,12 @@
     <select id="countByCond" resultType="Long">
         SELECT count(1)
         FROM dkic_b.t_mac_transfer as t
-                 left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
-                 left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
-                 left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
+        left join dkic_b.t_mac_transfer_item tmti ON t.trf_id = tmti.trf_id
+        left join dkic_b.t_mst_money_account tmmain ON tmti.trf_in_mac = tmmain.mac_id
+        left join dkic_b.t_mst_money_account tmmaout ON tmti.trf_out_mac = tmmaout.mac_id
+        left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id
+        left join dkic_b.t_mst_staff tms on t.staff_id = tms.staff_id
+        left join dkic_b.t_mst_staff as makestaff on t.make_staff = makestaff.staff_id
         <include refid="Condition"/>
     </select>
 

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.xml

@@ -147,11 +147,12 @@
         null AS  "macId",
         null	AS "balance",
         null AS "displayNo",
+        'true' AS "flgNegative",
         tmdd.cp_id
         FROM
         dkic_b.t_mst_dictionary_data tmdd
         WHERE
-        tmdd.cp_id = #{ cpId } and
+        tmdd.cp_id =  #{cpId} and
         tmdd.dict_code = '基础资料-账户' UNION ALL
         SELECT
         t.mac_id AS "macId",
@@ -164,6 +165,7 @@
         t.mac_id AS  "macId",
         t.balance AS  "balance",
         t.display_no AS  "displayNo",
+        t.flg_negative as "flgNegative",
         t.cp_id
         FROM
         dkic_b.t_mst_money_account as t

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -66,6 +66,9 @@
                 <result column="wh_id" property="whId"/>
                 <result column="wh_name" property="whName"/>
                 <result column="order_no" property="orderNo"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="short_name" property="shortName"/>
+        <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
                 <result column="transferableQuantity" property="transferableQuantity"/>
                 <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
     </resultMap>
@@ -153,6 +156,9 @@
                tmgs.sku_code  as "skuCode",
                tmgs.sku_model as "skuModel",
                tmgs.sku_name  as "skuName",
+               tmgs.sku_images,
+                tmgb.brand_name,
+                tmgb.short_name,
                t.item_qty,
                t.price_std,
                t.amt_std,
@@ -172,6 +178,7 @@
                 tmw.wh_name
         FROM dkic_b.t_psi_order_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
+                 inner join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
                  left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
         <include refid="Condition"/>
         order by t.item_index

src/main/java/com/dk/mdm/model/query/mac/MacTransferQuery.java

@@ -19,6 +19,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -58,7 +59,11 @@ public class MacTransferQuery extends PageInfo<MacTransferQuery> implements Seri
     @ApiModelProperty(value = "转账单号")
     private String trfNo;
 
-
+    /**
+     * 小程序的查询条件
+     */
+    @ApiModelProperty(value = "小程序的查询条件")
+    private String searchText;
     /**
      * 转账类型 (0：期初 1：业务)
      */
@@ -66,8 +71,33 @@ public class MacTransferQuery extends PageInfo<MacTransferQuery> implements Seri
     @ApiModelProperty(value = "转账类型 (0：期初 1：业务)")
     private Integer trfType;
 
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+    /**
+     * 组织名称
+     */
+    @Excel(name = "组织名称")
+    @ApiModelProperty(value = "组织名称")
+    @NotBlank(message = "请输入组织名称")
+    private String orgName;
 
     /**
+     * 转出账户
+     */
+    @Excel(name = "转出账户")
+    @ApiModelProperty(value = "转出账户")
+    private String trfOutMacName;
+    /**
+     * 转入账户
+     */
+    @Excel(name = "转入账户")
+    @ApiModelProperty(value = "转入账户")
+    private String trfInMacName;
+    /**
      * 部门
      */
     @Excel(name = "部门")
@@ -162,6 +192,15 @@ public class MacTransferQuery extends PageInfo<MacTransferQuery> implements Seri
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate makeTimeEnd;
 
+
+    @ApiModelProperty(value = "转账日期开始")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate accDateStart;
+
+    @ApiModelProperty(value = "转账日期结束")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate accDateEnd;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private List<Boolean> flgValidList;

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -1,9 +1,11 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
@@ -306,7 +308,10 @@ public class OutboundItemResponse {
     @ApiModelProperty(value = "新建编辑标识true:新建,false:编辑")
     private Boolean addOrEditFlag;
 
-
+    @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray skuImages;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -278,6 +278,7 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @ApiModelProperty(value = "源销售明细ID")
     @JsonProperty("sOrderItemId")
     private String sOrderItemId;
+    private String brandName;
 
     /**
      * 销售订单号
@@ -294,6 +295,8 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
 
+    private String shortName;
+
     @Excel(name = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "商品图片 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @TableField(typeHandler = JsonTypeHandler.class)

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

@@ -1,5 +1,6 @@
 package com.dk.mdm.model.vo.ivt;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -214,6 +215,10 @@ public class InOutRecordVO  {
     @ApiModelProperty(value = "业务单单号")
     private String biznisNo;
 
+    @ApiModelProperty(value = "出库商品顺序-库存调整给入库价")
+    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/FreezeService.java

@@ -216,4 +216,44 @@ public class FreezeService extends BaseService<Freeze> {
 		return ResponseResultUtil.success(super.updateByUuid(freeze));
 	}
 
+
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> updateFreeze(FreezeVO freezeVO) {
+
+		// 赋值全部解冻
+		String freezeStatus=Constant.FreezeStatusType.ALLUNFREEZE.getName();
+		// 查询冻结单明细
+
+		// 解冻
+		for (FreezeItemVO freezeItemVO : freezeVO.getItemList()) {
+
+			FreezeItem freezeItem = new FreezeItem();
+			// 赋值实体
+			freezeItem.setItemId(freezeItemVO.getItemId()).setUnfreezeQty(freezeItemVO.getSurplusQty())
+					.setSurplusQty(BigDecimal.ZERO);
+			// 修改冻结单明细解冻量
+			freezeItemService.updateByUuid(freezeItem);
+			// 查询库存信息
+			Inventory inventoryForUpdate=inventoryMapper.selectByIdForUpdate(freezeItemVO.getInvId());
+			// 库存冻结量=库存冻结量-实际解冻量
+			BigDecimal freezeqty=inventoryForUpdate.getFreezeQty().subtract(freezeItemVO.getSurplusQty());
+			// 库存可售量=库存可售量+实际解冻量
+			BigDecimal usableQt=inventoryForUpdate.getUsableQty().add(freezeItemVO.getSurplusQty());
+			// 更新修改内容信息
+			Inventory inventoryUpdate = new Inventory();
+			// 赋值库存可售量、冻结量和库存ID值
+			inventoryUpdate.setInvId(freezeItemVO.getInvId()).setFreezeQty(freezeqty).setUsableQty(usableQt);
+			// 修改库存冻结量、可售量
+			inventoryService.updateByUuid(inventoryUpdate);
+		}
+		// 赋值冻结表状态和ID
+		Freeze freeze=new Freeze();
+		freeze.setFreezeId(freezeVO.getFreezeId()).setFreezeStatus(freezeStatus);
+		// 更新主表冻结状态
+		return ResponseResultUtil.success(super.updateByUuid(freeze));
+	}
+
+
 }

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) {
@@ -352,7 +351,7 @@ public class InventoryService extends BaseService<Inventory> {
                     //根据来源id明细查询移动的出库单的单价、成本单价、金额等信息 赋值给需要已入的入库单
                     intoList = this.selectOutbound(intoList);
                     //入库
-                    this.warehouseAdjustmentInto(intoList);
+                    intoList = this.warehouseAdjustmentInto(intoList);
                     //修改入库单单价、金额、成本等信息
                     this.updateIntobound(intoList);
                 } else if (outDetail.size() == 0 && 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.selectById(inOutRecordVO.getSOutItemId());
-            //单价
-            inOutRecordVO.setPriceInto(outboundItemResponse.getPriceOut());
-            //金额
-            inOutRecordVO.setIntoAmt(outboundItemResponse.getOutAmt());
-            //成本单价
-            inOutRecordVO.setCostPrice(outboundItemResponse.getCostPrice());
-        }
-
-        return inOutRecordVOList;
-    }
-
-    /**
      * @desc : 修改入库单---单价、金额、成本等信息
      * @date : 2024/4/16 10:18
      * @author : 寇珊珊
@@ -1598,7 +1575,7 @@ public class InventoryService extends BaseService<Inventory> {
         BigDecimal sumOutQty = inOutRecordVOList.stream().map(InOutRecordVO::getIntoQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         BigDecimal sumOutAmt = inOutRecordVOList.stream().map(InOutRecordVO::getIntoAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         //region  编辑入库单数量
-        InboundResponse inboundResponse = inboundMapper.selectMessageByOtherQuery(new InboundQuery().setFromId(inOutRecordVOList.get(0).getBiznisId()));
+        InboundResponse inboundResponse = inboundMapper.selectMessageByOtherQuery(new InboundQuery().setIntoId(inOutRecordVOList.get(0).getBiznisId()));
         Inbound inbound = new Inbound();
         inbound.setIntoId(inboundResponse.getIntoId());
         inbound.setIntoQty(sumOutQty.abs());
@@ -1611,8 +1588,8 @@ public class InventoryService extends BaseService<Inventory> {
 
         //region 明细
         for (InOutRecordVO inOutRecordVO : inOutRecordVOList) {
-            List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().
-                    setFromId(inOutRecordVO.getBiznisId()).setFromItemId(inOutRecordVO.getBiznisItemId()));
+            List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery()
+                    .setItemId(inOutRecordVO.getBiznisItemId()));
             InboundItemResponse inboundItemResponse = inboundItemResponses.get(0);
             InboundItem inboundItem = new InboundItem();
             //总单id
@@ -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 : 寇珊珊

src/main/java/com/dk/mdm/service/mac/MacTransferService.java

@@ -85,15 +85,16 @@ public class MacTransferService extends BaseService<MacTransfer> {
 	public ResponseResultVO<PageList<MacTransferResponse>> selectByCond(MacTransferQuery macTransferQuery) {
 		List<MacTransferResponse> list = macTransferMapper.selectByCond(macTransferQuery);
 		for(int i =0;i<list.size();i++){ //显示明细第一条的 内容
+			MacTransferResponse  macTransferResponse = list.get(i);
 			// 转账明细
 			List<MacTransferItemResponse> itemList = macTransferItemMapper.selectByCond(new MacTransferItemQuery().setTrfId(list.get(i).getTrfId()));
 	     if(itemList.size()>0){
 			 MacTransferItemResponse macTransferItemResponse = itemList.get(0);
-			 list.get(i).setTrfInMac(macTransferItemResponse.getTrfInMac());
-			 list.get(i).setTrfOutMac(macTransferItemResponse.getTrfOutMac());
-			 list.get(i).setAmtTrf(macTransferItemResponse.getAmtTrf());
-			 list.get(i).setTrfInMacName(macTransferItemResponse.getTrfInMacName());
-			 list.get(i).setTrfOutMacName(macTransferItemResponse.getTrfOutMacName());
+			 macTransferResponse.setTrfInMac(macTransferItemResponse.getTrfInMac());
+			 macTransferResponse.setTrfOutMac(macTransferItemResponse.getTrfOutMac());
+			 macTransferResponse.setAmtTrf(macTransferItemResponse.getAmtTrf());
+			 macTransferResponse.setTrfInMacName(macTransferItemResponse.getTrfInMacName());
+			 macTransferResponse.setTrfOutMacName(macTransferItemResponse.getTrfOutMacName());
 		 }
 		}
 

src/main/java/com/dk/mdm/service/mst/SaleChannelService.java

@@ -98,7 +98,7 @@ public class SaleChannelService extends BaseService<SaleChannel> {
 			return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.SALECHANNEL_NAME_NOT.getMessage());
 		}else{
 			//新建如果是默认取消其他默认
-			if(saleChannelVO.getFlgDefault()){
+			if(saleChannelVO.getFlgDefault() != null && saleChannelVO.getFlgDefault()){
 				//默认  把其他置为非默认
 				saleChannelMapper.updateFlgDefault(authUtils.getStaff().getCpId());
 			}

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -188,6 +188,19 @@ public class StaffService extends BaseService<Staff> {
     }
 
     /**
+     * @desc : 注册商户时候插入  角色 基础资料（仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因） 计量单位 种类  打印票据  等等。
+     *         返回角色的数据
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:49
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> insertFeignCompanyData(Map<String, List<Map<String, Object>>> map) {
+
+        return ResponseResultUtil.success(null);
+    }
+
+
+    /**
      * @desc : 保存方法-邀请员工的确定
      * @author : 姜永辉
      * @date : 2023/1/9 10:49