Merge remote-tracking branch 'origin/release' into test

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);
 

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">

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){
+    public R updateOrderItem(@RequestBody String param){
-        log.info("订单更新物料请参orderinfoId：{},entId:{}",orderId,entId);
+        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("系统异常");

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);

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java

@@ -1,8 +1,8 @@
 package com.dxhy.order.consumer.modules.order.service;
 
+import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO;
 import com.dxhy.order.model.OrderProcessInfo;
 import com.dxhy.order.model.PageUtils;
-import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO;
 
 import java.util.List;
 import java.util.Map;
@@ -51,6 +51,9 @@ public interface OrderProcessService {
      */
     PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList);
 
+
+    List<OrderProcessInfo> queryOrderInfo(Map map, List<String> shList, List<String> entList);
+
     /**
      * 更新开票状态
      *

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -1734,26 +1734,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.setFpqqlsh(fpqqlsh + "-bh" + i1);
-                orderProcessInfo.setDdqqpch(pageRequest.getFpqqlsh() + "-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);
@@ -1808,16 +1813,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;
+        for (OrderItemInfo orderItemInfo : collect) {
-        int i = 0;
-        for (OrderItemInfo orderItemInfo : orderItemInfos) {
-//            if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){
-//                continue;
-//            }
             CommodityCodeEntity commodityCodeEntity = commodityCodeMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(orderItemInfo.getZxbm(), null, entId);
             // 如果公司物料库匹配失败，从集团物料库匹配
             if (commodityCodeEntity == null) {
@@ -1831,18 +1832,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){
+        List<String> collect1 = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm())).map(t -> t.getSpbm()).collect(Collectors.toList());
-            //更新order_info 清单标志为4
+        if(collect1.size()==orderItemInfos.size()){
-            OrderInfo orderInfo = new OrderInfo();
+            Map map = new HashMap(2);
-            orderInfo.setId(orderInfoId);
+            map.put("cpy","Y");
-            orderInfo.setQdBz("4");
+            Integer integer = taxClassCodeMapper.countTaxClassCodeBySpbm(collect1, map);
-            orderMapper.updateOrderInfoByOrderId(orderInfo,null);
+            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);
@@ -1967,20 +1971,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())){
+        if(StrUtil.isNotBlank(commodity.getInvoiceName())){
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString();
+            spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName()).toString();
-            }else{
+        }else{
-                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc()).toString();
+            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();
-            }
         }
         item.setXmmc(spmc);
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java

@@ -1,22 +1,21 @@
 package com.dxhy.order.consumer.modules.order.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity;
 import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.OrderInfoEnum;
-import com.dxhy.order.model.OrderInvoiceInfo;
-import com.dxhy.order.model.OrderProcessInfo;
-import com.dxhy.order.model.OrderProcessInfoExt;
-import com.dxhy.order.model.PageUtils;
 import com.dxhy.order.consumer.dao.OrderProcessInfoExtMapper;
 import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO;
 import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO;
 import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService;
+import com.dxhy.order.model.OrderInvoiceInfo;
+import com.dxhy.order.model.OrderProcessInfo;
+import com.dxhy.order.model.OrderProcessInfoExt;
+import com.dxhy.order.model.PageUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -92,7 +91,12 @@ public class OrderProcessServiceImpl implements OrderProcessService {
         return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(),
                 pageInfo.getPageNum());
     }
-    
+
+    @Override
+    public List<OrderProcessInfo> queryOrderInfo(Map map, List<String> shList, List<String> entList) {
+        return orderProcessInfoMapper.queryOrderInfo(map, shList, entList);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateKpzt(String fpqqlsh, String ddzt, String kpzt, String sbyy, String sld, String sldMc, String fjh, List<String> shList) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncUserReqBO.java

@@ -34,12 +34,21 @@ public class MdmSyncUserReqBO {
 
     // 人员状态的值
     private String DESC59;
+    private String DESC4;
 
     // UUID的值
     private String UUID;
 
     private Boolean success;
 
+    public String getDESC4() {
+        return DESC4;
+    }
+
+    public void setDESC4(String DESC4) {
+        this.DESC4 = DESC4;
+    }
+
     public void setCODE(String CODE) {
         this.CODE = CODE;
     }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java

@@ -49,6 +49,7 @@ import com.dxhy.order.utils.CommonUtils;
 import com.dxhy.order.utils.DecimalCalculateUtil;
 import com.dxhy.order.utils.JsonUtils;
 import com.dxhy.order.utils.NsrsbhUtils;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -58,6 +59,7 @@ import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 订单对外接口业务实现类-发票开具接口
@@ -1256,6 +1258,23 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
         //校验请求流水号是否重复
         if (ObjectUtil.isNotNull(selectOrderProcessInfo)) {
             if (OrderInfoEnum.DATE_DELETE_STATUS_1.getKey().equals(selectOrderProcessInfo.getOrderStatus())) {
+                Map<String, String> map = Maps.newHashMap();
+                map.put("originOrderId",selectOrderProcessInfo.getOrderInfoId());
+                map.put("orderStatus",OrderInfoEnum.DATE_DELETE_STATUS_0.getKey());
+                List<OrderProcessInfo> processInfos = orderProcessService.queryOrderInfo(map, null, null);
+                if(processInfos != null && !processInfos.isEmpty()){
+                    //证明是拆分的订单
+                    List<String> invalidList = orderInvoiceInfoService.countInoviceInfo(processInfos.stream().map(OrderProcessInfo::getOrderInfoId).collect(Collectors.toList()));
+                    List<OrderProcessInfo> infos = processInfos.stream().filter(p -> (OrderInfoEnum.ORDER_STATUS_5.getKey().equals(p.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(p.getDdzt()))).collect(Collectors.toList());
+                    if(infos != null && infos.size() == processInfos.size()){
+                        log.error("{}证明是拆分的订单 已开票/已冲红,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh);
+                        throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3);
+                    }
+                    if(invalidList != null && invalidList.size() == processInfos.size()){
+                        log.error("{}证明是拆分的订单,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh);
+                        throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3);
+                    }
+                }
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010015_V3);
             }
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -46,6 +46,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
@@ -773,7 +774,22 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
         }
         item.setXmmc(spmc);
 
-        //发票行性质为折扣行,不补全,单价,数量,单位,规格型号
+        if(StringUtils.isNotBlank(item.getXmmc())){
+            String xmmc = item.getXmmc();
+            try {
+                if (xmmc.getBytes(ConfigureConstant.STRING_CHARSET_GBK).length > ConfigureConstant.INT_90) {
+                    log.debug("对明细行商品名称进行截取,截取前数据为:{}", xmmc);
+                    xmmc = StringUtil.subStringByByte(xmmc, ConfigureConstant.INT_90);
+                    log.debug("对明细行商品名称进行截取,截取后数据为:{}", xmmc);
+                    item.setXmmc(xmmc);
+                }
+            } catch (IOException e) {
+                //编码格式错误
+                log.error("处理商品名称异常：{}", e);
+                throw new RuntimeException(e);
+            }
+        }
+            //发票行性质为折扣行,不补全,单价,数量,单位,规格型号
         if (!OrderInfoEnum.FPHXZ_CODE_1.getKey().equals(item.getFphxz())) {
             //规格型号
             if (StringUtils.isBlank(item.getGgxh()) && StringUtils.isNotBlank(commodity.getGgxh())) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java

@@ -10,9 +10,7 @@ import com.dxhy.order.consumer.constant.InterfaceNameEnum;
 import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
 import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.model.page.PageRequestVO;
-import com.dxhy.order.consumer.modules.order.controller.OrderInvoiceController;
 import com.dxhy.order.consumer.modules.order.service.OrderInfoService;
-import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.dxhy.order.consumer.openapi.protocol.po.EsOutput;
 import com.dxhy.order.consumer.openapi.protocol.po.IsInput;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
@@ -154,6 +152,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
             poCommonResponseParam.setES_OUTPUT(esOutput);
             return poCommonResponseParam;
         }
+
         //拆分或者页面逻辑删除的订单也需要重新修改流水号，否则进不来
 //        List<OrderProcessInfo> collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList());
 //        if(collect.isEmpty()){

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java

@@ -476,7 +476,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                     .code(mdmSyncUserReqBO.getCODE()) // 用户编码
                     .email(mdmSyncUserReqBO.getDESC11()) // 电子邮箱
                     .companyCode(mdmSyncUserReqBO.getDESC37()) // 公司编码
-                    .userStatus(mdmSyncUserReqBO.getDESC59()) // 员工状态 0离职、1离岗、2退休、3在岗、4死亡
+                    .userStatus(mdmSyncUserReqBO.getDESC4()) // 员工状态 0离职、1离岗、2退休、3在岗、4死亡
                     .password("Sdny@"+mdmSyncUserReqBO.getCODE())
                     .dataSource("1")
                     .build();

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfo.java

@@ -50,6 +50,7 @@ public class ExportInvoiceItemInfo implements Serializable {
      * 商品编码
      */
     private String spbm;
-    
+    private String kb;
+
     
 }

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/excel/ExportInvoiceItemInfoEnum.java

@@ -48,8 +48,12 @@ public enum ExportInvoiceItemInfoEnum {
     EXCEL_EXPORT_INVOICE_SL("30", "sl", "税率"),
     EXCEL_EXPORT_INVOICE_SE("31", "se", "税额"),
     EXCEL_EXPORT_INVOICE_SPBM("32", "spbm", "税收分类编码"),
-    EXCEL_EXPORT_INVOICE_BMBBBH("33", "bmbbbh", "编码表版本号"),
+    EXCEL_EXPORT_INVOICE_KB("33", "kb", "矿别"),
-    EXCEL_EXPORT_INVOICE_ITEM("34", "exportInvoiceItemInfoList", "数组");
+    EXCEL_EXPORT_INVOICE_BMBBBH("34", "bmbbbh", "编码表版本号"),
+    EXCEL_EXPORT_INVOICE_ITEM("35", "exportInvoiceItemInfoList", "数组")
+
+
+    ;
     
     /**
      * key

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -664,6 +664,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
                     exportInvoiceItemInfo.setSl(StringUtils.isNotBlank(orderItemInfo.getSl()) ? orderItemInfo.getSl() : "");
                     exportInvoiceItemInfo.setSe(StringUtils.isNotBlank(orderItemInfo.getSe()) ? orderItemInfo.getSe() : "");
                     exportInvoiceItemInfo.setSpbm(StringUtils.isNotBlank(orderItemInfo.getSpbm()) ? orderItemInfo.getSpbm() : "");
+                    exportInvoiceItemInfo.setKb(StringUtils.isNotBlank(orderItemInfo.getKb()) ? orderItemInfo.getKb() : "");
                     exportInvoiceItemInfoList.add(exportInvoiceItemInfo);
                 }