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.xml

@@ -1151,9 +1151,9 @@
         select
           s.staff_name as "staffName"
         , s.staff_code as "staffCode"
-        , sys.f_code_name(s.staff_code, s.staff_name) AS "staffCodeName",
+        , sys.f_code_name(s.staff_code, s.staff_name) AS "staffCodeName"
         , s.staff_id as "staffId"
-        , s.staff_id AS "id",
+        , s.staff_id AS "id"
         , s.org_id as "orgId"
         , o.org_name as "orgName"
         , c.cp_name as "cpName"
@@ -1161,7 +1161,7 @@
         left join dkic_b.t_mst_org o on o.org_id = s.org_id
         left join dkic_a.t_a_company c on c.cp_id = s.cp_id
         where
-        u.cp_id = #{cpId}
+        s.cp_id = #{cpId}
         <if test="staffCode !=null and staffCode !=''">
             AND s.staff_code LIKE concat('%',my_ex.likequery(#{staffCode}),'%')
         </if>

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

@@ -181,9 +181,10 @@
         <result column="price_purchase" property="pricePurchase"/>
         <result column="reject_qty" property="rejectQty"/>
         <result column="sku_images" property="skuImages"  typeHandler="JsonTypeHandler"/>
-        <result column="usable_qty" property="usable_qty"/>
+        <result column="usable_qty" property="usableQty"/>
         <result column="inv_qty" property="invQty"/>
         <result column="outing_qty" property="outingQty"/>
+        <result column="price_std" property="priceStd"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -495,6 +496,8 @@
         tpit.usable_qty AS list_usable_qty,
         tpit.inv_qty AS list_inv_qty,
         tpit.outing_qty AS list_outing_qty
+        ,
+        tmgs.price_standard AS list_price_std
     </sql>
 
 

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

@@ -14,10 +14,10 @@
 
 
     <sql id="Base_Column_List_Join">
-        tpiri.item_id, tpiri.return_id, tpiri.into_id, tpiri.into_item_id, tpiri.pur_id, tpiri.pur_item_id, tpiri.item_index, tpiri.sku_id, tpiri.item_qty,
+            tpiri.item_id, tpiri.return_id, tpiri.into_id, tpiri.into_item_id, tpiri.pur_id, tpiri.pur_item_id, tpiri.item_index, tpiri.sku_id, tpiri.item_qty,
                      tpiri.price_std,tpiri.amt_std, tpiri.price_return,
                tpiri.item_amt, tpiri.non_std_code, tpiri.out_status, tpiri.outing_qty, tpiri.outing_amt, tpiri.out_qty, tpiri.out_amt,
-                     tpiri.remarks, tpiri.flg_valid, tpiri.cp_id,tpiri.wh_id
+                     tpiri.remarks, tpiri.flg_valid, tpiri.cp_id
     </sql>
 
 
@@ -148,19 +148,19 @@
     <sql id="Condition_Join">
         <where>
             <if test="returnId != null and returnId != ''">
-                AND tpiri.return_id = #{returnId}
+                AND tpiri.return_id = #{returnId}::uuid
             </if>
             <if test="intoId != null and intoId != ''">
-                AND tpiri.into_id = #{intoId}
+                AND tpiri.into_id = #{intoId}::uuid
             </if>
             <if test="intoItemId != null and intoItemId != ''">
-                AND tpiri.into_item_id = #{intoItemId}
+                AND tpiri.into_item_id = #{intoItemId}::uuid
             </if>
             <if test="purId != null and purId != ''">
-                AND tpiri.pur_id = #{purId}
+                AND tpiri.pur_id = #{purId}::uuid
             </if>
             <if test="purItemId != null and purItemId != ''">
-                AND tpiri.pur_item_id = #{purItemId}
+                AND tpiri.pur_item_id = #{purItemId}::uuid
             </if>
             <if test="itemIndex != null">
                 AND tpiri.item_index = #{itemIndex}

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

@@ -342,6 +342,7 @@
         left join  sys.t_data_kind tdk1 on  tdk1.kind_code = tpir.out_status
         left join  sys.t_data_kind tdk2 on  tdk2.kind_code = tpir.return_status
         <include refid="Condition_Response"/>
+            order by tpir.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.xml

@@ -16,6 +16,7 @@
         tppi.sku_id,
         tppi.item_qty,
         tppi.price_std as "pricePurchase",
+        tppi.price_std,
         tppi.amt_std,
         tppi.price_pur,
         tppi.item_amt,

src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -143,6 +143,11 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             BigDecimal returnAmt = inboundItemResponse.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP));
             sumReturnQty = sumReturnQty.add(returnQty);
             sumReturnAmt = sumReturnAmt.add(returnAmt);
+            //反写入库单退货数量金额 todo
+            InboundResponse inboundResponse = inboundMapper.selectById(intoReturnItemVO.getIntoId());
+            inboundMapper.updateAmount(new Inbound().setIntoId(intoReturnItemVO.getIntoId())
+                    .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
+                    .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
             inboundItemMapper.updateAmount(
                     new InboundItem()
                             .setItemId(inboundItemResponse.getItemId())
@@ -161,11 +166,7 @@ public class IntoReturnService extends BaseService<IntoReturn> {
 
             );
         }
-        //反写入库单退货数量金额 todo
-        InboundResponse inboundResponse = inboundMapper.selectById(intoReturnVO.getIntoId());
-        inboundMapper.updateAmount(new Inbound().setIntoId(intoReturnVO.getIntoId())
-                .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
-                .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
+
         //新建出库单
         OutboundVO outboundVO = new OutboundVO();
         //来源ID
@@ -177,7 +178,7 @@ public class IntoReturnService extends BaseService<IntoReturn> {
         //员工
         outboundVO.setStaffId(intoReturnVO.getStaffId());
         //出库状态 待出库
-        outboundVO.setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+        outboundVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
         //供应商
         outboundVO.setSupId(intoReturnVO.getSupId());
         outboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
@@ -223,7 +224,7 @@ public class IntoReturnService extends BaseService<IntoReturn> {
         //退货状态 通过
         intoReturnVO.setReturnStatus(Constant.returnStatus.OUT_REJECT_STATUS_ADOPT.getName());
         //出库状态
-        intoReturnVO.setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+        intoReturnVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
         //制单员
         intoReturnVO.setMakeStaff(authUtils.getStaff().getStaffId());
         //业务员
@@ -272,13 +273,16 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //退货金额 (商品数量*退货价)
             intoReturnItemVO.setItemAmt(intoReturnItemVO.getItemQty().multiply(intoReturnItemVO.getPriceReturn()).setScale(2, BigDecimal.ROUND_HALF_UP));
             //自动]出库赋值  已入库数量、已入库金额
-            if (intoReturnVO.getFlgAutoIvt()) {
+            if (intoReturnVO.getFlgAutoIvt() != null && intoReturnVO.getFlgAutoIvt()) {
                 intoReturnItemVO.setOutQty(intoReturnItemVO.getItemQty().abs());
                 intoReturnItemVO.setOutAmt(intoReturnItemVO.getItemAmt().abs());
+                intoReturnItemVO.setOutStatus(Constant.OutStatus.YICHUKU.getName());
+
 
             } else {
                 intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty().abs());
                 intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt().abs());
+                intoReturnItemVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
             }
             //新建明细
             IntoReturnItem intoReturnItem = intoReturnItemConvert.convertToPo(intoReturnItemVO);

src/main/java/com/dk/mdm/service/ivt/OutboundService.java

@@ -351,7 +351,10 @@ public class OutboundService extends BaseService<Outbound> {
             double sumOutingAmt = 0;    // 合计出库中金额
             for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
                 OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
-                outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName())
+                outboundItem
+                        .setOutId(outbound.getOutId())
+                        .setCpId(outbound.getCpId())
+                        .setOutStatus(Constant.OutStatus.CHUKUZHONG.getName())
                         .setOutType(Constant.OutType.PURRETURN.getName());
                 outboundItemMapper.insert(outboundItem);