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

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

@@ -557,7 +557,7 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     Long getGoodsForIntoCountByPage(Map param);
 
     /**
-     * @desc :  销售分析-我的 门店助手的 销售金额 收款金额 库存成本
+     * @desc :  销售分析-我的 门店助手的 销售金额 收款金额 库存成本--根据制单员权限
      * @date : 2024/4/20 11:21
      * @author : 姜永辉
      */

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

@@ -1937,7 +1937,7 @@
 
     <!-- 销售分析-我的 门店助手的 销售金额 收款金额 库存成本 -->
     <select id="getHomeOrderRecCost" resultType="java.util.Map">
-        select dkic_b.f_get_home_order_rec_cost(#{cpId},#{dateBegin}::date,#{dateEnd}::date)
+        select dkic_b.f_get_home_order_rec_cost(#{cpId},#{dateBegin}::date,#{dateEnd}::date,#{staffId}::uuid)
     </select>
 
     <!--查询用户授权数-->

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

@@ -301,7 +301,7 @@
             <if test="nonStdCode != null and nonStdCode != ''">
                 AND tpi.non_std_code = #{nonStdCode}
             </if>
-            <if test="nonStdCode == null and nonStdCode == ''">
+            <if test="nonStdCode == null or nonStdCode == ''">
                 AND tpi.non_std_code = '-'
             </if>
         </where>

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

@@ -178,27 +178,48 @@
 
     <!--查询应收和收款汇总（根据制单员权限）-->
     <select id="getReceivableAccountSum" resultType="Map">
-        SELECT SUM
-        ( CASE WHEN tmai.acc_item_type = '账款类型-应收' THEN tmai.amt_should ELSE 0 END ) AS receivable,
-        SUM ( CASE WHEN tmai.acc_item_type = '账款类型-收款' THEN tmai.amt_rec ELSE 0 END ) AS receipt
-        FROM
-        dkic_b.t_mac_account_item tmai
-        WHERE
-        tmai.flg_valid
-        AND tmai.cp_id = #{cpId}
-        AND (
-        tmai.make_staff = #{staffId}::uuid
-        OR EXISTS ( SELECT 1 FROM dkic_b.t_mst_staff_purview tmsp WHERE tmsp.staff_id = tmai.make_staff AND
-        tmsp.purview_code = 'PU10000003' )
-        )
-        <!--开始日期-->
-        <if test="accDateStart != null">
-            AND tmai.acc_date &gt;= #{accDateStart,typeHandler=TimestampTypeHandler}
-        </if>
-        <!--截止日期-->
-        <if test="accDateEnd != null">
-            AND tmai.acc_date &lt;= #{accDateEnd,typeHandler=TimestampTypeHandler}
-        </if>
+        select
+
+            (SELECT SUM ( tpo.fact_amt) AS receivable
+            FROM
+            dkic_b.t_psi_order tpo
+            WHERE
+            tpo.flg_valid
+            AND tpo.cp_id = #{cpId}
+            AND (
+            tpo.make_staff = #{staffId}::uuid
+            OR EXISTS ( SELECT 1 FROM dkic_b.t_mst_staff_purview tmsp WHERE tmsp.staff_id = tpo.make_staff AND
+            tmsp.purview_code = 'PU10000003' )
+            )
+            <!--开始日期-->
+            <if test="accDateStart != null">
+                AND tpo.make_time &gt;= #{accDateStart,typeHandler=TimestampTypeHandler}
+            </if>
+            <!--截止日期-->
+            <if test="accDateEnd != null">
+                AND tpo.make_time &lt;= #{accDateEnd,typeHandler=TimestampTypeHandler}
+            </if>
+            ),
+            (SELECT SUM ( tmrp.sum_amt_rec) AS receipt
+            FROM   dkic_b.t_mac_rec_pay tmrp
+            WHERE
+                 tmrp.flg_valid
+            AND tmrp.cp_id = #{cpId}
+            AND (
+            tmrp.make_staff = #{staffId}::uuid
+            OR EXISTS ( SELECT 1 FROM dkic_b.t_mst_staff_purview tmsp WHERE tmsp.staff_id = tmrp.make_staff AND
+            tmsp.purview_code = 'PU10000003' )
+            )
+            <!--开始日期-->
+            <if test="accDateStart != null">
+                AND tmrp.acc_date &gt;= #{accDateStart,typeHandler=TimestampTypeHandler}
+            </if>
+            <!--截止日期-->
+            <if test="accDateEnd != null">
+                AND tmrp.acc_date &lt;= #{accDateEnd,typeHandler=TimestampTypeHandler}
+            </if>
+            )
+
     </select>
 
     <!-- 查询应收账款明细 -->

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

@@ -278,8 +278,6 @@
         tms.staff_name AS "staffName",
         tms2.staff_name AS "reportStaffName",
         tdk.kind_name_i18n ->> #{i18n} AS "saleStatusName",
-        -- tccfs.follow_staff as follow_staff,
-        -- tms1.staff_name as follow_staff_name
         (SELECT COUNT(1) FROM dkic_b.t_psi_order tpo WHERE tpo.cus_id = tmc.cus_id AND tpo.cp_id = tmc.cp_id AND
         tpo.flg_valid) AS "orderQuantity",
         (SELECT sum(tpo.fact_amt) FROM dkic_b.t_psi_order tpo WHERE tpo.cus_id = tmc.cus_id AND tpo.cp_id = tmc.cp_id
@@ -289,7 +287,7 @@
         (SELECT COUNT(1) FROM dkic_b.t_psi_outbound tpob WHERE tpob.cus_id = tmc.cus_id AND tpob.cp_id = tmc.cp_id AND
         tpob.flg_valid AND tpob.out_type = '出库类型-销售出库' AND tpob.out_status = '出库状态-已出库') AS
         "outboundQuantity",
-        (SELECT sum(tpob.out_amt) FROM dkic_b.t_psi_outbound tpob WHERE tpob.cus_id = tmc.cus_id AND tpob.cp_id =
+        (SELECT sum(tpob.fact_amt) FROM dkic_b.t_psi_outbound tpob WHERE tpob.cus_id = tmc.cus_id AND tpob.cp_id =
         tmc.cp_id AND tpob.flg_valid AND tpob.out_type = '出库类型-销售出库' AND tpob.out_status = '出库状态-已出库') AS
         "outboundAmount",
 

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

@@ -357,10 +357,10 @@
                 any(#{goodsBrandList,typeHandler=UuidListTypeHandler})
             </if>
             <if test="skuName != null and skuName != ''">
-                AND tmgs.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
+                AND tpoi.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
             </if>
             <if test="skuModel != null and skuModel != ''">
-                AND tmgs.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
+                AND tpoi.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
             </if>
             <if test="brandName != null and brandName != ''">
                 AND tmgb.brand_name like concat('%', my_ex.likequery(#{brandName}) , '%')
@@ -444,10 +444,10 @@
                 any(#{goodsBrandList,typeHandler=UuidListTypeHandler})
             </if>
             <if test="skuName != null and skuName != ''">
-                AND tmgs.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
+                AND tpii.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
             </if>
             <if test="skuModel != null and skuModel != ''">
-                AND tmgs.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
+                AND tpii.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
             </if>
             <if test="brandName != null and brandName != ''">
                 AND tmgb.brand_name like concat('%', my_ex.likequery(#{brandName}) , '%')
@@ -1073,6 +1073,9 @@
         ,concat(sys.f_remove_zero(tpoi.out_qty),tmgu.unit_name) as "outQtyPiece"
         ,sys.f_remove_zero(tpoi.out_qty) as "outQty"
         ,tpoi.out_amt as "outAmt"
+        ,tpoi.fact_amt as "factAmt"
+        ,tpoi.disc_amt as "discAmt"
+        ,tpoi.discount as "discount"
         ,sys.f_remove_zero(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"
@@ -1124,8 +1127,8 @@
         ,tpi.into_date as "outDate"
         ,tpi.remarks
         ,makestaff.staff_name as "makeStaffName"
-        ,tmgs.sku_name as "skuName"
-        ,tmgs.sku_model as "skuModel"
+        ,tpii.sku_name as "skuName"
+        ,tpii.sku_model as "skuModel"
         ,tmgs.sku_spec as "skuSpec"
         ,tpii.non_std_code as "nonStdCode"
         ,tmgb.short_name as "shortName"
@@ -1139,6 +1142,9 @@
         ,concat(sys.f_remove_zero(abs(tpii.into_qty)),tmgu.unit_name) as "outQtyPiece"
         ,sys.f_remove_zero(tpii.into_qty) as "outQty"
         ,tpii.into_amt as "outAmt"
+        ,tpii.into_amt+tpii.intoing_amt as "factAmt"
+        ,0.00 as "discAmt"
+        ,0.00 as "discount"
         ,sys.f_remove_zero(tpii.return_qty) as "returnQty"
         ,tpii.return_amt as "returnAmt"
         ,dkic_b.f_box_piece(tmgus.unit_name,tmgu.unit_name,abs(tpii.intoing_box),abs(tpii.intoing_piece)) as "outingBoxPiece"
@@ -1514,8 +1520,8 @@
             t.item_index AS "itemIndex",
             t.sku_id AS "skuId",
             tmgs.sku_code  as "skuCode",
-            tmgs.sku_model as "skuModel",
-            tmgs.sku_name  as "skuName",
+            t.sku_model as "skuModel",
+            t.sku_name  as "skuName",
             tmgb.brand_name AS "brandName",
             t.item_qty AS "itemQty",
             sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n}) as "outStatusName",
@@ -1546,11 +1552,11 @@
         dkic_b.f_box_piece ( tmgus.unit_name, tmgu.unit_name, T.BOX, T.piece ) AS "boxPiece"
         FROM dkic_b.t_psi_order_item as t
         inner join dkic_b.t_psi_order tpo on tpo.order_id = t.order_id
-        inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
+        left join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
         left join dkic_b.t_mst_warehouse tmw on tmw.wh_id = t.wh_id
         left join dkic_b.t_mst_customer tmc on tmc.cus_id = tpo.cus_id
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
-        left join sys.t_data_kind as tdk3 on tpo.out_status = tdk3.kind_code
+        left join sys.t_data_kind as tdk3 on t.out_status = tdk3.kind_code
         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="ConditionSaleItem"/>
@@ -1627,10 +1633,10 @@
                 AND tpo.make_time &lt; #{makeTimeEnd}::timestamp with time zone + interval '1 day'
             </if>
             <if test="skuName != null and skuName != ''">
-                AND tmgs.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
+                AND t.sku_name like concat('%', my_ex.likequery(#{skuName}) , '%')
             </if>
             <if test="skuModel != null and skuModel != ''">
-                AND tmgs.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
+                AND t.sku_model like concat('%', my_ex.likequery(#{skuModel}) , '%')
             </if>
             <if test="brandName != null and brandName != ''">
                 AND tmgb.brand_name like concat('%', my_ex.likequery(#{brandName}) , '%')

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

@@ -278,7 +278,7 @@
         t.delivery_date,
         sys.f_remove_zero(t.sum_quantity) as sum_quantity,
         t.sum_standard,
-        t.sum_amount, t.sale_discount,
+        t.sum_amount, t.sale_discount,T.fact_amt,
         t.order_status, t.out_status,
         sys.f_remove_zero(t.outing_qty) as  outing_qty, t.outing_amt, sys.f_remove_zero(t.out_qty) as  out_qty,
         t.out_amt, sys.f_remove_zero(t.return_qty) as  return_qty, t.return_amt,

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseService.java

@@ -1270,8 +1270,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
     public String setIntoStatus(BigDecimal intoingQty, BigDecimal intoQty, BigDecimal sumQty) {
         //入库状态
         String intoStatus = null;
-        //入库中+已入库 小于 总数
-        if (intoingQty.add(intoQty).compareTo(sumQty) < 0) {
+        //入库中+已入库 小于 总数 并且  入库中数量 等于订单总数量
+        if (intoingQty.compareTo(sumQty) <= 0 && intoingQty.add(intoQty).compareTo(sumQty) <= 0) {
             //入库中
             intoStatus = Constant.IntoStatus.RUKUZHONG.getName();
         }
@@ -1280,8 +1280,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
             //待入库
             intoStatus = Constant.IntoStatus.DAIRUKU.getName();
         }
-        //入库中+已入库 等于 总数
-        else if (intoingQty.add(intoQty).compareTo(sumQty) == 0) {
+        //入库中+已入库 等于 总数 并且 入库中数量 小于等于订单总数量
+        else if (intoingQty.compareTo(sumQty) < 0 && intoingQty.add(intoQty).compareTo(sumQty) == 0) {
             //已入库
             intoStatus = Constant.IntoStatus.YIRUKU.getName();
         }

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

@@ -1784,21 +1784,21 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
      */
     @Transactional(rollbackFor = {Exception.class})
     public String setOutStatus(BigDecimal intoingQty, BigDecimal intoQty, BigDecimal sumQty) {
-        //入库状态
+        //出库状态
         String outStatus = null;
-        //入库中+已入库 小于 总数
-        if (intoingQty.add(intoQty).compareTo(sumQty) < 0) {
-            //入库中
+        //出库中+已出库 小于 总数   或者 出库中数量小于等于订单总数量
+        if (intoingQty.compareTo(sumQty) <= 0 && intoingQty.add(intoQty).compareTo(sumQty) <= 0   ) {
+            //出库中
             outStatus = Constant.OutStatus.CHUKUZHONG.getName();
         }
-        //已入库数量=0 入库中数量=0
+        //已出库数量=0 出库中数量=0
         else if (intoQty.compareTo(BigDecimal.ZERO) == 0 && intoingQty.compareTo(BigDecimal.ZERO) == 0) {
-            //待入库
+            //待出库
             outStatus = Constant.OutStatus.DAICHUKU.getName();
         }
-        //入库中+已入库 等于 总数
-        else if (intoingQty.add(intoQty).compareTo(sumQty) == 0) {
-            //已入库
+        //出库中+已出库 等于 总数  并且 出库中数量小于等于订单总数量
+        else if (intoingQty.compareTo(sumQty) < 0 && intoingQty.add(intoQty).compareTo(sumQty) == 0) {
+            //已出库
             outStatus = Constant.OutStatus.YICHUKU.getName();
         }
         return outStatus;

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

@@ -314,9 +314,10 @@ public class PaymentService extends BaseService<RecPay> {
         if (!recPayForUpdate.getFlgValid()) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }
-        if(recPayForUpdate.getBiznisId() != null){
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
-        }
+        // 240624 问完付斌后
+//        if(recPayForUpdate.getBiznisId() != null){
+//            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
+//        }
         // 如果所在月份已结账，则不能作废 todo
 
         // 查出并锁定所有应付核销明细

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

@@ -368,9 +368,9 @@ public class ReceiptService extends BaseService<RecPay> {
         if (!recPayForUpdate.getFlgValid()) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }
-        if(recPayForUpdate.getBiznisId() != null){
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
-        }
+//        if(recPayForUpdate.getBiznisId() != null){
+//            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
+//        }
 
         // 将之前的明细全部删除
         List<RecPayItem> recPayItemOriginalList = recPayItemMapper.selectByZIdForUpdate(recPayVO.getRpId());
@@ -609,9 +609,10 @@ public class ReceiptService extends BaseService<RecPay> {
         if (!recPayForUpdate.getFlgValid()) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }
-        if(recPayForUpdate.getBiznisId() != null){
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
-        }
+        // 240624 问完付斌后
+//        if(recPayForUpdate.getBiznisId() != null){
+//            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVOICE_FORBID_EDIT.getMessage());
+//        }
         // 如果所在月份已结账，则不能作废 todo
 
         // 查出并锁定所有应收核销明细

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

@@ -165,6 +165,7 @@ public class StaffService extends BaseService<Staff> {
         StaffQuery staffQuery = new StaffQuery();
         staffQuery.setStaffPhone(staff.getStaffPhone());
         staffQuery.setCpId(cpId);
+        staffQuery.setFlgValid(true);
         staff.setCpId(cpId);
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
         if (staffResponses != null && staffResponses.size() > 0) {
@@ -282,6 +283,7 @@ public class StaffService extends BaseService<Staff> {
         StaffQuery staffQuery = new StaffQuery();
         staffQuery.setCpId(staff.getCpId());
         staffQuery.setStaffPhone(staff.getStaffPhone());
+        staffQuery.setFlgValid(true);
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
         if (staffResponses != null && staffResponses.size() > 0) {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
@@ -577,6 +579,7 @@ public class StaffService extends BaseService<Staff> {
         StaffQuery staffQuery = new StaffQuery();
         staffQuery.setCpId(staff.getCpId());
         staffQuery.setStaffPhone(staff.getStaffPhone());
+        staffQuery.setFlgValid(true);
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
         if (staffResponses != null && staffResponses.size() > 0) {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);
@@ -618,6 +621,7 @@ public class StaffService extends BaseService<Staff> {
         StaffQuery staffQuery = new StaffQuery();
         staffQuery.setStaffPhone(staff.getStaffPhone());
         staffQuery.setCpId(cpId);
+        staffQuery.setFlgValid(true);
         List<StaffResponse> staffResponses = staffMapper.selectByCond(staffQuery);
         if (staffResponses != null && staffResponses.size() > 0 && !staffVO.getStaffId().equals(staffResponses.get(0).getStaffId())) {
             return ResponseResultUtil.error(ResponseCodeEnum.ERROR_STAFF_PHONE_EXIST);

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -490,9 +490,11 @@ public class OrderService extends BaseService<Order> {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }
         // 如果全部出库了
-        if (orderForUpdate.getSumQuantity().compareTo(orderForUpdate.getOutQty()) == 0) {
-            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_OUT.getMessage());
-        }
+        //标：之前沟通允许大编辑，目前订单开单已出库的单子进行编辑是不允许操作的（请确定一下，到底系统设计是否允许大编辑？）
+        //bug 6933可查
+//        if (orderForUpdate.getSumQuantity().compareTo(orderForUpdate.getOutQty()) == 0) {
+//            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORDER_IS_OUT.getMessage());
+//        }
 
         // 明细实体（避免并发，需要再查一遍）
         OrderItem orderItemForUpdate;