1、物流订单辅助单位查询调整；

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -1003,6 +1003,7 @@ public class KwpGoodsService {
         boolean mainPlatform = remoteSystemService.queryMainPlatform(accessSpecial);
         //if (!mainPlatform) {
             List<Long> entIds = remoteSystemService.queryEntIdsByCode(accessSpecial, String.valueOf(EntTypeEnum.SUPPLIER.getCode()));
+            //entIds.remove(LoginUserHolder.getEntId());
             wrapper.in(KwpGoods::getEntId, entIds);
         //}
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderGoodsUnitMapper.java

@@ -14,6 +14,8 @@ import java.util.Map;
 @Mapper
 public interface KwtLogisticsOrderGoodsUnitMapper extends BaseMapper<KwtLogisticsOrderGoodsUnit> {
 
+    List<KwtLogisticsOrderGoodsUnit> findList(Map<String, Object> params);
+
     List<KwtLogisticsOrderGoodsUnit> findGoodsUnit(Map<String, Object> params);
 
     KwtLogisticsOrderGoodsUnit findGoodsUnitCount(Map<String, Object> params);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsOrderGoodsService.java

@@ -113,7 +113,7 @@ public class KwtLogisticsOrderGoodsService {
         goodsMapper.insert(kwtLogisticsOrderGoods);
 
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", logisticsOrder.getId());
         }});
         if (CollectionUtils.isNotEmpty(assistUnit)) {
@@ -160,7 +160,7 @@ public class KwtLogisticsOrderGoodsService {
      */
     public void editLogisticsOrderGoodsLoading(Long lOrderId) {
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", lOrderId);
         }});
         if (CollectionUtils.isNotEmpty(assistUnit)) {
@@ -196,7 +196,7 @@ public class KwtLogisticsOrderGoodsService {
      */
     public void editLogisticsOrderGoodsTotalLoading(Long lOrderId) {
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", lOrderId);
         }});
         if (CollectionUtils.isNotEmpty(assistUnit)) {
@@ -222,7 +222,7 @@ public class KwtLogisticsOrderGoodsService {
      */
     public void editLogisticsOrderGoodsTotalLoading(OrderManualCompletionDto params) {
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", params.getId());
         }});
         List<OrderGoodsLoadingDto> loading = params.getLoading();
@@ -289,7 +289,7 @@ public class KwtLogisticsOrderGoodsService {
     public List<GoodsUnitVo> assistUnit(Long lOrderId) {
         List<GoodsUnitVo> units = new ArrayList<>();
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", lOrderId);
         }});
 
@@ -319,7 +319,7 @@ public class KwtLogisticsOrderGoodsService {
      */
     public List<KwtLogisticsOrderGoodsUnit> findGoodsUnit(Long lOrderId) {
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", lOrderId);
         }});
         return assistUnit;
@@ -335,7 +335,7 @@ public class KwtLogisticsOrderGoodsService {
     public List<GoodsLoadingParam> goodsLoadingParams(KwtLogisticsOrder logisticsOrder, List<OrderGoodsLoadingDto> loading) {
         List<GoodsLoadingParam> loadingParams = new ArrayList<>();
         //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
             put("lOrderId", logisticsOrder.getId());
         }});
         //数据处理
@@ -373,18 +373,18 @@ public class KwtLogisticsOrderGoodsService {
      */
     public List<GoodsLoadingParam> goodsLoadingParams(KwtLogisticsOrder logisticsOrder, boolean operator) {
         List<GoodsLoadingParam> loadingParams = new ArrayList<>();
-        //辅助单位
-        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findGoodsUnit(new HashMap<>(NumberConstant.SIXTEEN) {{
-            put("lOrderId", logisticsOrder.getId());
-        }});
-        log.info("assistUnit:{}", JSONObject.toJSONString(assistUnit));
         //住单位
         BigDecimal amount = logisticsOrder.getAmount();
         loadingParams.add(new GoodsLoadingParam(logisticsOrder.getUnit(), operator ? amount : amount.negate(), logisticsOrder.getTotalLoadAmount()));
 
+        //辅助单位
+        List<KwtLogisticsOrderGoodsUnit> assistUnit = goodsUnitMapper.findList(new HashMap<>(NumberConstant.SIXTEEN) {{
+            put("lOrderId", logisticsOrder.getId());
+        }});
+        log.info("assistUnit:{}", JSONObject.toJSONString(assistUnit));
         //数据处理
         if (CollectionUtils.isNotEmpty(assistUnit) && (assistUnit.size() > 0)) {
-            assistUnit.forEach(ee -> {
+            for (KwtLogisticsOrderGoodsUnit ee:assistUnit) {
                 BigDecimal loadAmount = ee.getTotalLoadAmount() == null ? new BigDecimal("0.00") : ee.getTotalLoadAmount();
                 BigDecimal conversionValue = ee.getConversionValue();
                 if (ee.getUnit().equals(ee.getFromUnit())) {
@@ -395,7 +395,7 @@ public class KwtLogisticsOrderGoodsService {
                     BigDecimal value = loadAmount.divide(conversionValue);
                     loadingParams.add(new GoodsLoadingParam(ee.getUnit(), operator ? value : value.negate(), loadAmount));
                 }
-            });
+            }
         }
         return loadingParams;
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtTransportCommonService.java

@@ -240,9 +240,9 @@ public class KwtTransportCommonService {
         if (logisticsOrder.getBillingMode().equals(String.valueOf(NumberConstant.ONE))) {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getTotalLoadAmount() == null ? null : logisticsOrder.getTotalLoadAmount());
         } else if (logisticsOrder.getBillingMode().equals(String.valueOf(NumberConstant.TWO))) {
-            orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
+            orderDetailVO.setPerformanceAmount(logisticsOrder.getTotalUnloadAmount() == null ? null : logisticsOrder.getTotalUnloadAmount());
         } else {
-            orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
+            orderDetailVO.setPerformanceAmount(logisticsOrder.getTotalUnloadAmount() == null ? null : logisticsOrder.getTotalUnloadAmount());
         }
 //        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
         orderDetailVO.setTotalLoadAmount(logisticsOrder.getTotalLoadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getTotalLoadAmount());

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderGoodsUnitMapper.xml

@@ -30,12 +30,31 @@
         create_time, update_by, update_time, del_flag
     </sql>
 
+    <select id="findList" resultType="com.sckw.transport.model.KwtLogisticsOrderGoodsUnit" parameterType="java.util.Map" >
+        SELECT
+        id, l_order_id lOrderId, goods_id goodsId, from_unit fromUnit, to_unit toUnit,
+        conversion_value conversionValue, unit,unload_amount unloadAmount , load_amount loadAmount,
+        total_load_amount totalLoadAmount, total_unload_amount totalUnloadAmount,
+        remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
+        from kwt_logistics_order_goods_unit
+        where del_flag = 0
+        <if test="lOrderId != null and goodsId != ''">
+            and l_order_id = #{lOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="unit != null and unit != ''">
+            and unit = #{unit, jdbcType=INTEGER}
+        </if>
+        ORDER BY create_time desc
+    </select>
+
     <select id="findGoodsUnit" resultType="com.sckw.transport.model.KwtLogisticsOrderGoodsUnit" parameterType="java.util.Map" >
         SELECT
             id, l_order_id lOrderId, goods_id goodsId, from_unit fromUnit, to_unit toUnit,
-            conversion_value conversionValue, unit, IFNULL(SUM(unload_amount), 0.0) unloadAmount,
-            IFNULL(SUM(load_amount), 0.0) loadAmount, IFNULL(SUM(total_load_amount), 0.0) totalLoadAmount,
-            IFNULL(SUM(total_unload_amount), 0.0) totalUnloadAmount,
+            conversion_value conversionValue, unit,
+            if(unit is null, null, IFNULL(SUM(unload_amount), 0.0)) unloadAmount,
+            if(unit is null, null, IFNULL(SUM(load_amount), 0.0)) loadAmount,
+            if(unit is null, null, IFNULL(SUM(total_load_amount), 0.0)) totalLoadAmount,
+            if(unit is null, null, IFNULL(SUM(total_unload_amount), 0.0)) totalUnloadAmount,
             remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
         from kwt_logistics_order_goods_unit
         where del_flag = 0