出库异常查询修改;

mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -139,7 +140,9 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
     private List<OutOrderAbnormal> genPickingOrderMaterialDetailList(OutOrderAbnormalBaseDO OutOrderAbnormalBaseDO, List<PickingMaterialDetail> pickingMaterialDetailList){
         LoginUser loginUser = SecurityUtils.getLoginUser();
         List<OutOrderAbnormal> outOrderAbnormalList = new ArrayList<>();
+        //BigDecimal actualQuantity = BigDecimal.ZERO;
         for (PickingMaterialDetail pickingMaterialDetail : pickingMaterialDetailList){
+            //actualQuantity = actualQuantity.add(pickingMaterialDetail.getPickingQuantity());
             //拣货
             if (pickingMaterialDetail.getPickingQuantity().compareTo(pickingMaterialDetail.getQuantity()) != 0){
                 //判断是否存在异常  根据设置的是否允许超收 取值动态赋值 先默认写死 收货异常
@@ -208,4 +211,4 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
         return outOrderAbnormalList;
     }
 
-}
+}

mhd_wms/src/main/resources/mapper/outOrderAbnormal/OutOrderAbnormalMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  a.out_order_abnormal_id, a.organization_id, a.organization_name, a.top_organization_id, a.abnormal_number,  a.out_order_number,  a.picking_order_number, a.out_task_order_number, a.type, a.quantity, a.actual_quantity, a.abnormal_actual_quantity, a.abnormal_type, a.abnormal_reason, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag    </sql>
 
     <sql id="selectOutOrderAbnormalPo11">
-        a.out_order_abnormal_id, a.organization_id, a.organization_name, a.top_organization_id, a.abnormal_number,  a.picking_order_number, a.out_task_order_number, a.type,  a.actual_quantity, a.abnormal_actual_quantity, a.abnormal_type, a.abnormal_reason, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag    </sql>
+        a.out_order_abnormal_id, a.organization_id, a.organization_name, a.top_organization_id, a.abnormal_number,  a.picking_order_number, a.out_task_order_number, a.type,  a.quantity, a.abnormal_actual_quantity, a.abnormal_type, a.abnormal_reason, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag    </sql>
 
     <sql id="selectOutOrderAbnormalPo1">
         <if test="organizationId != null ">
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.wms.domain.outOrderAbnormal.repository.todo.OutOrderAbnormalDO" resultMap="OutOrderAbnormalResult">
         select
             <include refid="selectOutOrderAbnormalPo11"/>
-            <include refid="com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper.joinStockOutOrderPo"/>
+            <include refid="com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper.joinStockOutOrderPoYc"/>
         from out_order_abnormal a
         left join stock_out_order b on a.out_order_number = b.out_order_number
         <where>

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -107,6 +107,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.priority_level_name, b.direct_warehouse, b.review, b.annex_url, b.quantity
     </sql>
 
+    <sql id="joinStockOutOrderPoYc">
+        ,b.notice_number, b.out_order_number, b.warehouse_id, b.warehouse_code, b.warehouse_name, b.shipper_id, b.shipper_code,
+        b.shipper_name, b.order_type_code, b.order_type_name, b.customer_id, b.customer_name, b.expect_time, b.supply_chain_number, b.priority_level_code,
+        b.priority_level_name, b.direct_warehouse, b.review, b.annex_url
+    </sql>
+
     <sql id="selectStockOutOrderPo1">
         <if test="outOrderId != null ">
             and a.out_order_id = #{outOrderId}