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

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/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/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/inventory/InventoryService.java

@@ -351,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 ) {

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/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