Merge remote-tracking branch 'origin/master'

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

@@ -88,6 +88,7 @@
                t.flg_negative,
                t.remarks,
                t.flg_valid,
+                t.flg_default,
                t.cp_id,
                coalesce(tmti.amt_trf, 0) as "initBalance"
         FROM dkic_b.t_mst_money_account as t

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

@@ -880,7 +880,7 @@
     </select>
     <!-- 采购明细报表明细 -->
     <select id="getPurDetailReport" resultType="java.util.Map">
-        select
+        select distinct
         tpp.pur_id as "purId"
         ,tpp.pur_no as "purNo"
         ,tmo.org_name as "orgName"
@@ -902,7 +902,7 @@
         ,tpp.amt_residue as "amtResidue"
         ,tpp.remarks
         ,tpo.order_no as "orderNo"
-        ,ib.into_no as "intoNo"
+        ,tpp.make_time as "makeTime"
         ,tmgs.sku_name as "skuName"
         ,tmgs.sku_model as "skuModel"
         ,tmgs.sku_spec as "skuSpec"
@@ -938,13 +938,12 @@
         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_order as tpo on tpo.order_id = tppi.from_id
-        left join dkic_b.t_psi_inbound_item as ibi on ibi.from_item_id=tppi.item_id
-        left join dkic_b.t_psi_inbound as ib on ibi.into_id=ib.into_id
+
         left join sys.t_data_kind tdk3 on tdk3.kind_code = tppi.into_status
         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_PurDetailReport"/>
-        order by tpp.op_create_time desc
+        order by tpp.make_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -966,8 +965,6 @@
         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_order as tpo on tpo.order_id = tppi.from_id
-        left join dkic_b.t_psi_inbound_item as ibi on ibi.from_item_id=tppi.item_id
-        left join dkic_b.t_psi_inbound as ib on ibi.into_id=ib.into_id
         left join sys.t_data_kind tdk3 on tdk3.kind_code = tppi.into_status
         <include refid="Condition_PurDetailReport"/>
     </select>

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

@@ -1442,8 +1442,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
                 purchase.setPurId(fromId);
                 purchase.setIntoQty(purchaseSumQty);
                 purchase.setIntoAmt(purchaseSumAmt);
-                purchase.setIntoingAmt(updatePurchaseIntoingQty.negate());
-                purchase.setIntoingQty(updatePurchaseIntoingAmt.negate());
+                purchase.setIntoingAmt(updatePurchaseIntoingAmt.negate());
+                purchase.setIntoingQty(updatePurchaseIntoingQty.negate());
                 //入库状态
                 String purIntoStatus = this.setIntoStatus(purchaseResponse.getIntoingQty().add(purchase.getIntoingQty()),
                         purchaseResponse.getIntoQty().add(purchase.getIntoQty()), purchaseResponse.getSumQuantity());
@@ -1811,8 +1811,14 @@ public class InboundPurchaseService extends BaseService<Inbound> {
         }
         //已入库 数量>0 入库中数量=0
         else if (intoQty.compareTo(BigDecimal.ZERO) > 0 && intoingQty.compareTo(BigDecimal.ZERO) == 0) {
-            //已入库
-            intoStatus = Constant.IntoStatus.YIRUKU.getName();
+            if (sumQty.compareTo(intoQty.add(intoingQty)) == 0) {
+                //已入库
+                intoStatus = Constant.IntoStatus.YIRUKU.getName();
+            } else {
+                //入库中
+                intoStatus = Constant.IntoStatus.RUKUZHONG.getName();
+            }
+
         }
         return intoStatus;
     }