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

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

@@ -326,7 +326,80 @@
             </if>
         </where>
     </sql>
+    <sql id="ConditionIsSup">
+        <where>
+            <if test="intoNo != null and intoNo != ''">
+                AND tpi.into_no LIKE concat('%',my_ex.likequery(#{intoNo}),'%')
+            </if>
+            <if test="intoType != null and intoType != ''">
+                AND tpi.into_type LIKE concat('%',my_ex.likequery(#{intoType}),'%')
+            </if>
+            <if test="intoTypes != null and intoTypes.size()>0">
+                AND tpi.into_type =any(#{intoTypes,typeHandler=StringListTypeHandler})
+            </if>
+            <if test="intoReasonList != null and intoReasonList.size()>0">
+                AND tpi.into_reason =any(#{intoReasonList,typeHandler=UuidListTypeHandler})
+            </if>
+
+            <if test="fromId != null and fromId != ''">
+                AND tpi.from_id = #{fromId}::uuid
+            </if>
+            <if test="fromNo != null and fromNo != ''">
+                AND tpi.from_no LIKE concat('%',my_ex.likequery(#{fromNo}),'%')
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND tpi.org_id = #{orgId}::uuid
+            </if>
+            <if test="orgName != null and orgName != ''">
+                AND tmo.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+            </if>
+            <if test="supName != null and supName != ''">
+                AND tmp.sup_name LIKE concat('%',my_ex.likequery(#{supName}),'%')
+            </if>
+            <if test="staffName != null and staffName != ''">
+                AND tms.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+            </if>
+            <if test="whName != null and whName != ''">
+                AND tmw.wh_name LIKE concat('%',my_ex.likequery(#{whName}),'%')
+            </if>
+            <if test="staffId != null and staffId != ''">
+                AND tpi.staff_id = #{staffId}::uuid
+            </if>
+            <if test="cusId != null and cusId != ''">
+                AND tpi.cus_id = #{cusId}::uuid
+            </if>
+            <if test="supId != null and supId != ''">
+                AND tpi.sup_id = #{supId}::uuid
+            </if>
+            <if test="makeStaff != null and makeStaff != ''">
+                AND tpi.make_staff = #{makeStaff}
+            </if>
 
+            <if test="makeTime != null">
+                AND tpi.make_time = #{makeTime}
+            </if>
+            <if test="receivableId != null and receivableId != ''">
+                AND tpi.receivable_id = #{receivableId}
+            </if>
+            <if test="flgValid != null">
+                AND tpi.flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND tpi.cp_id = #{cpId}
+            </if>
+            <if test="searchText !=null and searchText != ''">
+                AND ( tpi.into_no   LIKE concat('%',my_ex.likequery(#{searchText}),'%')
+                or  (exists (select 1 from dkic_b.t_psi_inbound_item tpii
+                left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpii.sku_id
+                where
+                tpi.into_id = tpii.into_id
+                and tpii.flg_valid
+                AND position(#{searchText} in tmgs.sku_model) > 0
+                ))
+                )
+            </if>
+        </where>
+    </sql>
     <sql id="idsForeach">
         <!-- 根据主键intoId批量操作 -->
         WHERE into_id in
@@ -572,7 +645,9 @@
         left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id) T
         WHERE T.RK = 1) as i
         on i.sku_id = tpii.sku_id and i.non_std_code = tpii.non_std_code and i.cp_id = tpii.cp_id
-        <include refid="Condition"/>
+
+
+        <include refid="ConditionIsSup"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -584,7 +659,9 @@
         count(1)
         FROM dkic_b.t_psi_inbound tpi
         left join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
-        <include refid="Condition"/>
+        left  join  dkic_b.t_mst_warehouse tmw on  tmw.wh_id =   tpii.wh_id
+        inner join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
+        <include refid="ConditionIsSup"/>
     </select>
 
 
@@ -997,6 +1074,10 @@
         <result column="channel_name" property="channelName" />
         <result column="cus_from_name" property="cusFromName" />
         <result column="return_address" property="returnAddress" />
+        <result column="purSumAmount" property="purSumAmount" />
+        <result column="purReturnAmt" property="purReturnAmt" />
+
+
     </resultMap>
 
     <sql id="Join_Table_Return">
@@ -1060,8 +1141,11 @@
         ,case when tpi.receivable_id is null then false
         when tmai.amt_handle = 0 then false
         else true end as "paymentFlag"
+        ,tpp.sum_amount AS "purSumAmount"
+        ,tpp.return_amt AS "purReturnAmt"
         FROM dkic_b.t_psi_inbound tpi
         Left join dkic_b.t_mst_org tmo on tmo.org_id = tpi.org_id
+        Left join dkic_b.t_psi_purchase tpp on tpp.pur_id = tpi.from_id
         Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = tpi.sup_id
         Left join dkic_b.t_mst_staff tms on tms.staff_id = tpi.staff_id
         Left join dkic_b.t_mst_staff tms1 on tms1.staff_id = tpi.make_staff

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

@@ -1860,7 +1860,13 @@
     <select id="getDailyReconciliationReportCount" resultType="java.lang.Long">
         SELECT count(1)
         FROM
-        dkic_b.t_psi_order tpo
+        FROM dkic_b.t_mac_account_item as T
+        left join (select sum(tpo.sum_amount) as totalOrderAmount ,tpo.cus_id from dkic_b.t_psi_order tpo group by tpo.cus_id ) ord on ord.cus_id =T.object_id
+        left join dkic_b.t_mac_other_receivable as tmor on tmor.receivable_id = t.biznis_id and t.biznis_type = 't_mac_other_receivable'
+        left join dkic_b.t_mst_customer tmc on tmc.cus_id = t.object_id
+        left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
+        left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
+        left join sys.t_data_kind as tdk1 on t.rec_status = tdk1.kind_code
         <include refid="ConditionDailyReconciliationReport"/>
     </select>
 
@@ -1868,7 +1874,22 @@
     <sql id="ConditionDailyReconciliationReport">
         <where>
             <if test="cpId != null">
-                tpo.cp_id = #{cpId}
+                T.cp_id = #{cpId}
+            </if>
+            <if test="staffId != null">
+                T.staff_id = #{staffId}
+            </if>
+            <if test="orgId != null">
+                T.org_id = #{orgId}
+            </if>
+            <if test="object_id != null">
+                T.object_id = #{object_id}
+            </if>
+            <if test="accDateStart != null">
+                AND T.acc_date &gt;= #{accDateStart}::timestamp with time zone
+            </if>
+            <if test="accDateEnd != null">
+                AND T.acc_date &lt; #{accDateEnd}::timestamp with time zone + interval '1 day'
             </if>
         </where>
     </sql>

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItemCost.java

@@ -41,7 +41,7 @@ public class OutboundItemCost extends PageInfo<OutboundItemCost> implements Seri
     /**
      * 存货批次明细ID
      */
-    @TableId(value = "batch_id", type = IdType.AUTO)
+//    @TableId(value = "batch_id", type = IdType.AUTO)
     @ApiModelProperty(value = "存货批次明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String batchId;

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

@@ -403,6 +403,10 @@ public class InboundResponse  {
     private Boolean paymentFlag;
 
 
+    private BigDecimal purSumAmount;
+
+    private BigDecimal purReturnAmt;
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -923,6 +923,8 @@ public class InventoryService extends BaseService<Inventory> {
                 outboundItemCost.setCostAmt(inOutRecordVO.getIntoAmt());
             }
         }
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUNDCOST.getName(), false);
+        outboundItemCost.setBatchId(codeMap.get("outId").toString());
         //新建
         outboundItemCostMapper.insert(outboundItemCost);
     }