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

src/main/java/com/dk/mdm/controller/mac/MacTransferItemController.java

@@ -1,7 +1,16 @@
 package com.dk.mdm.controller.mac;
 
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
+import com.dk.mdm.model.response.mac.MacTransferItemResponse;
+import com.dk.mdm.model.response.pur.PurchaseItemResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,4 +29,18 @@ public class MacTransferItemController {
     @Autowired
     private MacTransferItemService macTransferItemService;
 
+    /**
+     * @desc   : 条件查询
+     * @author : 常皓宁
+     * @date   : 2024/2/28 15:11
+     */
+    @ApiOperation(
+            value = "分页、关联、条件查询",
+            notes = "分页、关联、条件查询"
+    )
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<MacTransferItemResponse>> selectByCond(@RequestBody MacTransferItemQuery macTransferItemQuery) {
+        return macTransferItemService.selectByCond(macTransferItemQuery);
+    }
+
 }

src/main/java/com/dk/mdm/mapper/mac/MacTransferItemMapper.java

@@ -3,6 +3,7 @@ package com.dk.mdm.mapper.mac;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
 import com.dk.mdm.model.response.mac.MacTransferItemResponse;
 import org.springframework.stereotype.Repository;
 
@@ -19,6 +20,14 @@ public interface MacTransferItemMapper extends BaseMapper<MacTransferItem> {
      * @date   : 2024-03-19 16:13
      */
     List<MacTransferItemResponse> selectByCond(MacTransferItemQuery macTransferItemQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 常皓宁
+     * @date   : 2024/2/28 15:17
+     */
+    Long countByCond(MacTransferItemQuery macTransferItemQuery);
+
     /**
      * @desc :根据主表主键锁定表t_mac_transfer_item的多行数据
      * @author : 付斌

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

@@ -104,6 +104,8 @@
     <select id="countByCond" resultType="Long">
         SELECT count(1)
         FROM dkic_b.t_mac_transfer_item as t
+        left join dkic_b.t_mst_money_account as main on main.mac_id = t.trf_in_mac
+        left join dkic_b.t_mst_money_account as maout on maout.mac_id = t.trf_out_mac
         <include refid="Condition"/>
     </select>
 

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -912,17 +912,22 @@
         ,makestaff.staff_name as "makeStaffName"
         ,tmgs.sku_name as "skuName"
         ,tmgs.sku_model as "skuModel"
+        ,tmgs.sku_spec as "skuSpec"
         ,tpi.non_std_code as "nonStdCode"
         ,tmgb.short_name as "shortName"
         ,tmgc.cat_name as "catName"
         ,series.series_name as "whName"
         ,tmw.wh_name as "seriesName"
         ,tpoi.outing_qty as "outingQty"
+        ,concat(tpoi.outing_qty,tmgu.unit_name)  as "outingQtyPiece"
         ,tpoi.outing_amt as "outingAmt"
+        ,concat(tpoi.out_qty,tmgu.unit_name)   as "outQtyPiece"
         ,tpoi.out_qty as "outQty"
         ,tpoi.out_amt as "outAmt"
         ,tpoi.return_qty as "returnQty"
         ,tpoi.return_amt as "returnAmt"
+        ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.outing_box,tpoi.outing_piece) as "outingBoxPiece"
+        ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.out_box,tpoi.out_piece) as "outBoxPiece"
         FROM dkic_b.t_psi_outbound as t
         left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
         Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
@@ -939,6 +944,8 @@
         left join dkic_b.t_mst_goods_series as series on series.series_id = tmgs.series_id
         left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
         left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
+        left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+        left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
         <include refid="Condition_OutboundDetailReport"/>
         order by tpoi.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -1065,6 +1072,8 @@
         ,tpoi.into_amt as "intoAmt"
         ,tpoi.return_qty as "returnQty"
         ,tpoi.return_amt as "returnAmt"
+        ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.intoing_box,tpoi.intoing_piece) as "intoingBoxPiece"
+        ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,tpoi.into_box,tpoi.into_piece) as "intoBoxPiece"
         FROM dkic_b.t_psi_inbound as t
         left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
         Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
@@ -1080,6 +1089,8 @@
         left join dkic_b.t_mst_goods_category as tmgc on tmgc.cat_id = tmgs.category_id
         left join dkic_b.t_mst_goods_series as series on series.series_id = tmgs.series_id
         left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
+        left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
+        left join dkic_b.t_mst_unit as tmgus on tmgs.sub_unit_id = tmgus.unit_id
         <include refid="Condition_IntoboundDetailReport"/>
         order by tpoi.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

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

@@ -1,9 +1,16 @@
 package com.dk.mdm.service.mac;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mac.MacTransferItem;
 import com.dk.mdm.mapper.mac.MacTransferItemMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mac.MacTransferItemQuery;
+import com.dk.mdm.model.query.pur.PurchaseItemQuery;
+import com.dk.mdm.model.response.mac.MacTransferItemResponse;
+import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,4 +32,14 @@ public class MacTransferItemService extends BaseService<MacTransferItem> {
 	@Autowired
 	private MacTransferItemMapper macTransferItemMapper;
 
+	/**
+	 * @desc   : 条件查询
+	 * @author : 常皓宁
+	 * @date   : 2024/2/28 15:16
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<MacTransferItemResponse>> selectByCond(MacTransferItemQuery macTransferItemQuery) {
+		return super.mergeListWithCount(macTransferItemMapper, macTransferItemMapper.selectByCond(macTransferItemQuery), macTransferItemMapper.countByCond(macTransferItemQuery));
+	}
+
 }

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

@@ -174,7 +174,7 @@ public class StaffService extends BaseService<Staff> {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_CODE_EXIST);
         }
         //可以绑定微信的员工人数  人数上限
-        if (staffVO.getFlgCanLogin()) {
+        if (staffVO.getFlgCanLogin()!=null && staffVO.getFlgCanLogin()) {
             ResponseResultVO<?> resultMaxnum = companyFeign.getCompanyMaxStaffNum(cpId);
             if (resultMaxnum.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
                 // 无用户
@@ -556,7 +556,7 @@ public class StaffService extends BaseService<Staff> {
         super.updateByUuid(staff);
 
         //可以绑定微信的员工人数  人数上限
-        if (staffVO.getFlgCanLogin()) {
+        if (staffVO.getFlgCanLogin()!=null && staffVO.getFlgCanLogin()) {
             ResponseResultVO<?> resultMaxnum = companyFeign.getCompanyMaxStaffNum(cpId);
             if (resultMaxnum.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
                 // 无用户