From 535fd0d559af1bd8490fd62c274620293ff4674a Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Sun, 21 May 2023 11:02:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E9=87=8D=E5=A4=8D=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E8=AE=A2=E5=8D=95=E4=B8=8D=E5=86=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=B5=81=E6=B0=B4=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index 5da67c2f..ee4d97ec 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -1726,26 +1726,31 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 }
                 String orderInfoId = pageRequest.getOrderInfoId();
                 String issuedSign = pageRequest.getIssuedSign();
+                String fpqqlsh = pageRequest.getFpqqlsh();
+                if(fpqqlsh.contains("-bh")){
+                    continue;
+                }
                 List<String> shList = Arrays.asList(pageRequest.getXhfNsrsbh());
+                //todo 此处随机值可以采用有序递增，但是判断较为麻烦点
                 int i1 = new Random().nextInt(100);
                 OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
                 orderProcessInfo.setOrderInfoId(orderInfoId);
                 orderProcessInfo.setOrderStatus(ConfigureConstant.STRING_1);
                 orderProcessInfo.setBhzt(ConfigureConstant.STRING_1);
-                orderProcessInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh" + i1);
-                orderProcessInfo.setDdqqpch(pageRequest.getFpqqlsh() + "-bh" + i1);
+                orderProcessInfo.setFpqqlsh(fpqqlsh + "-bh" + i1);
+                orderProcessInfo.setDdqqpch(fpqqlsh + "-bh" + i1);
                 orderProcessInfo.setUpdateTime(new Date());
                 if(ConfigureConstant.STRING_0.equals(issuedSign)){
                     OrderInvoiceInfo orderInvoiceInfo = new OrderInvoiceInfo();
                     orderInvoiceInfo.setOrderInfoId(orderInfoId);
-                    orderInvoiceInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh"+ i1);
+                    orderInvoiceInfo.setFpqqlsh(fpqqlsh + "-bh"+ i1);
                     orderProcessInfo.setOrderStatus(ConfigureConstant.STRING_0);
                     orderInvoiceInfoMapper.updateOrderInvoiceInfoByOrderId(orderInvoiceInfo,null);
                 }
                 int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo, shList);
                 OrderInfo orderInfo = new OrderInfo();
                 orderInfo.setId(orderInfoId);
-                orderInfo.setFpqqlsh(pageRequest.getFpqqlsh() + "-bh"+ i1);
+                orderInfo.setFpqqlsh(fpqqlsh + "-bh"+ i1);
                 orderInfo.setUpdateTime(new Date());
 
                 orderMapper.updateOrderInfoByOrderId(orderInfo,shList);

From 627675814d6aa06013145c3acaef8ccc9a76a801 Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Mon, 22 May 2023 15:27:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E5=85=81=E8=AE=B8=E6=89=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=8B=BE=E9=80=89=E7=89=A9=E6=96=99=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxclass/dao/TaxClassCodeMapper.java      |  7 +++
 .../mybatis/mapper/TaxClassCodeMapper.xml     | 14 ++++++
 .../order/controller/OrderInfoController.java | 14 ++++--
 .../order/service/OrderInfoService.java       |  2 +-
 .../service/impl/OrderInfoServiceImpl.java    | 50 ++++++++-----------
 5 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
index e6f2ee2b..85a01184 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/taxclass/dao/TaxClassCodeMapper.java
@@ -23,6 +23,13 @@ public interface TaxClassCodeMapper {
 
     TaxClassCodeEntity selectTaxClassCodeBySpbm(@Param("spbm") String spbm);
 
+    /**
+     * 根据税收编码统计数
+     * @param spbms
+     * @return
+     */
+    Integer countTaxClassCodeBySpbm(@Param("spbms") List<String> spbms,@Param("map")Map map);
+
 
     List<TaxClassCodeEntity> selectTaxClassCodeBySpmcOrSm(String queryString);
 
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
index 2a0bcf45..c78910a8 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/TaxClassCodeMapper.xml
@@ -44,6 +44,20 @@
         where tcc.spbm = #{spbm} limit 1
     </select>
 
+    <select id="countTaxClassCodeBySpbm" parameterType="java.lang.String" resultType="java.lang.Integer">
+        SELECT
+          count(*)
+        FROM
+        tax_class_code tcc
+        where tcc.spbm in
+        <foreach collection="spbms" item="spbm" open="(" separator="," close=")">
+            #{spbm}
+        </foreach>
+        <if test="map.cpy != null and map.cpy != ''">
+            and cpy = #{map.cpy}
+        </if>
+    </select>
+
 
     <select id="selectTaxClassCode" parameterType="map"
             resultType="com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity">
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
index 5011f059..1861724f 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
@@ -460,10 +460,18 @@ public class OrderInfoController {
     @ApiOperation(value = "订单更新物料", notes = "订单信息管理-更新物料")
     @PostMapping("/updateOrderItem")
     @SysLog(operation = "订单更新物料", operationDesc = "订单更新物料", key = "订单更新物料")
-    public R updateOrderItem(@RequestParam("orderId")String orderId,@RequestParam("entId")String entId){
-        log.info("订单更新物料请参orderinfoId：{},entId:{}",orderId,entId);
+    public R updateOrderItem(@RequestBody String param){
+        log.info("订单更新物料",param);
+        JSONObject jsonObject = JSONObject.parseObject(param);
+        String entId = jsonObject.getString("entId");
+        String orderInfoId = jsonObject.getString("orderInfoId");
+        JSONArray jsonArray = jsonObject.getJSONArray("itemList");
+        if(jsonArray == null || jsonArray.isEmpty()){
+            return R.error("请求参数有误,待合并明细行不允许为空");
+        }
+        List<String> itemList = jsonArray.toJavaList(String.class);
         try {
-            return orderInfoService.updateOrderItem(orderId,entId);
+            return orderInfoService.updateOrderItem(orderInfoId,entId,itemList);
         } catch (Exception e) {
             log.error(e.getMessage());
             return R.error("系统异常");
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
index 3c710b11..7970d0c0 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
@@ -216,7 +216,7 @@ public interface OrderInfoService {
     @Transactional
     R logicalDeleteByOrderInfoId(List<PageRequestVO> pageRequestList);
 
-    R updateOrderItem(String orderInfoId,String entId);
+    R updateOrderItem(String orderInfoId,String entId,List<String> itemList);
 
     @Transactional
     R mergeOrderItem(String entId,String orderInfoId,List<String> itemList);
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
index ee4d97ec..fb0b5f93 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@@ -1805,16 +1805,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     }
 
     @Override
-    public R updateOrderItem(String orderInfoId,String entId){
+    public R updateOrderItem(String orderInfoId,String entId,List<String> itemList){
         //根据订单id查询明细数据
         List<OrderItemInfo> orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null);
+        List<OrderItemInfo> collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId())).collect(Collectors.toList());
         List<OrderItemInfo> orderItemInfoList = new ArrayList<>();
-        Boolean oilMark = false;
-        int i = 0;
-        for (OrderItemInfo orderItemInfo : orderItemInfos) {
-//            if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){
-//                continue;
-//            }
+        for (OrderItemInfo orderItemInfo : collect) {
             CommodityCodeEntity commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), null, entId);
             // 如果公司物料库匹配失败，从集团物料库匹配
             if (commodityCodeEntity == null) {
@@ -1828,18 +1824,21 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 orderItemInfo.setZnfm(ConfigureConstant.STRING_0);
                 orderItemInfo.setXmsl(null);
                 orderItemInfo.setXmdj(null);
-                if(StringUtils.isNotBlank(commodityCodeEntity.getCpy()) && "Y".equals(commodityCodeEntity.getCpy())){
-                    i++;
-                }
             }
             orderItemInfoList.add(orderItemInfo);
         }
-        if(orderItemInfoList.size()==i){
-            //更新order_info 清单标志为4
-            OrderInfo orderInfo = new OrderInfo();
-            orderInfo.setId(orderInfoId);
-            orderInfo.setQdBz("4");
-            orderMapper.updateOrderInfoByOrderId(orderInfo,null);
+        List<String> collect1 = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm())).map(t -> t.getSpbm()).collect(Collectors.toList());
+        if(collect1.size()==orderItemInfos.size()){
+            Map map = new HashMap(2);
+            map.put("cpy","Y");
+            Integer integer = taxClassCodeMapper.countTaxClassCodeBySpbm(collect1, map);
+            if(orderItemInfoList.size()==integer.intValue()){
+                //更新order_info 清单标志为4
+                OrderInfo orderInfo = new OrderInfo();
+                orderInfo.setId(orderInfoId);
+                orderInfo.setQdBz("4");
+                orderMapper.updateOrderInfoByOrderId(orderInfo,null);
+            }
         }
         if(!orderItemInfoList.isEmpty()){
             orderItemInfoMapper.updateOrderItemId(orderItemInfoList);
@@ -1939,20 +1938,13 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         item.setZzstsgl(commodity.getZzstsgl());
 
         //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
-        String spmc = item.getXmmc();
+        String spmc = "";
         StringBuilder stringBuilder = new StringBuilder();
-        if (StringUtils.isBlank(spmc)) {
-            if(StrUtil.isNotBlank(commodity.getInvoiceName())){
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString();
-            }else{
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString();
-            }
-        } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) {
-            if(StrUtil.isNotBlank(commodity.getInvoiceName())){
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString();
-            }else {
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString();
-            }
+
+        if(StrUtil.isNotBlank(commodity.getInvoiceName())){
+            spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString();
+        }else{
+            spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString();
         }
         item.setXmmc(spmc);