Merge branch 'dev-new' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into dev-new

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java

@@ -12,9 +12,13 @@ import lombok.Setter;
 @Getter
 public class NewOrderExcel {
     /**
-     * 订单号
+     * 结算单号
      */
     private String ddh;
+    /**
+     * 报账单号
+     */
+    private String bzdh;
     /**
      * 发票种类代码（发票类型）
      */
@@ -135,6 +139,10 @@ public class NewOrderExcel {
      * 自行编码（自行商品编码）
      */
     private String zxbm;
+    /**
+     * 矿别
+     */
+    private String kb;
     /**
      * 备注
      */

order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java

@@ -392,6 +392,7 @@ public class ExcelUtils {
             orderItemInfo.setFphxz(OrderInfoEnum.FPHXZ_CODE_0.getKey());
         }
         orderItemInfo.setZxbm(orderExcel.getZxbm());
+        orderItemInfo.setKb(orderExcel.getKb());
         return orderItemInfo;
     }
 

order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoContentEnum.java

@@ -160,7 +160,7 @@ public enum OrderInfoContentEnum {
 
     ORDER_MERGE_FPLX_DIFFERENT_ERROR("9608", "所选订单发票类型不一致，不允许合并"),
     ORDER_MERGE_SKSB_DIFFERENT_ERROR("9608", "所选订单税控设备类型不一致，不允许合并"),
-    ORDER_MERGE_DDH_DIFFERENT_ERROR("9608", "所选结算单号不一致，不允许合并"),
+    ORDER_MERGE_DDH_DIFFERENT_ERROR("96081", "所选结算单号不一致，不允许合并"),
 
     ORDER_MERGE_GFXX_DIFFERENT_ERROR("9609", "所选订单购方信息不一致，不允许合并"),
 

order-management-common/src/main/java/com/dxhy/order/model/OrderInfo.java

@@ -401,4 +401,9 @@ public class OrderInfo implements Serializable {
      */
     private String sksbCode;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
 }

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

@@ -18,6 +18,12 @@ import java.util.Map;
  */
 public interface InvoiceService {
 
+    /**
+     * 生成预制发票
+     * @param pageInvoiceReq
+     * @return
+     */
+    R preInvoice(PageInvoiceReq pageInvoiceReq);
     /**
      * 根据id查询数据开票
      *

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

@@ -114,6 +114,44 @@ public class InvoiceServiceImpl implements InvoiceService {
     private TaxSpecialPolicyUtil taxSpecialPolicyUtil;
 
 
+    @Override
+    public R preInvoice(PageInvoiceReq pageInvoiceReq) {
+        List<PageInvoiceItem> pageInvoiceItemList = pageInvoiceReq.getPageInvoiceItemList();
+        //查询数据列表
+        List<CommonOrderInfo> commonOrderInfos = orderInfoService.batchQueryOrderInfoByOrderIdsAndNsrsbh(pageInvoiceItemList);
+        commonOrderInfos.stream().forEach(f -> {
+            String terminalCode = simsBackService.getTerminalCode(f.getOrderInfo().getXhfNsrsbh(), f.getOrderInfo().getEntId());
+            List<CommonOrderInfo> originalCommonOrderInfo = new ArrayList<>();
+            originalCommonOrderInfo.add(f);
+            List<CommonOrderInfo> orderSplit = new ArrayList<>();
+            // 订单超限额拆分
+            try {
+                orderSplit = generateReadyOpenOrderService.orderSplit(originalCommonOrderInfo, terminalCode, pageInvoiceReq.getUserId());
+                log.info("{},{}生成预制发票拆分结果:{}",LOGGER_MSG,f.getOrderInfo().getDdh(),JsonUtils.getInstance().toJsonString(orderSplit));
+            } catch (OrderSplitException e) {
+                log.error("{}生成预制发票拆分异常:",LOGGER_MSG,e);
+            }
+            if(orderSplit.size() == 1){
+                OrderProcessInfo processInfo = f.getProcessInfo();
+                processInfo.setYzfp(ConfigureConstant.STRING_1);
+                orderProcessService.updateOrderProcessInfoByProcessId(processInfo,null);
+            }else if(orderSplit.size() > 1){
+                List<CommonOrderInfo> commonOrderInfoSaveResults = new ArrayList<>();
+                try {
+                    commonOrderInfoSaveResults = generateReadyOpenOrderService.saveOrderSplitInfo(orderSplit);
+                } catch (OrderReceiveException e) {
+                    log.error("{}生成预制发票拆分后保存异常:",LOGGER_MSG,e);
+                }
+                commonOrderInfoSaveResults.stream().forEach(s -> {
+                    OrderProcessInfo processInfo = s.getProcessInfo();
+                    processInfo.setYzfp(ConfigureConstant.STRING_1);
+                    orderProcessService.updateOrderProcessInfoByProcessId(processInfo,null);
+                });
+            }
+        });
+        return R.ok("生成预制发票成功,请到开票处理页面查看");
+    }
+
     @Override
     public R batchInvoiceById(PageInvoiceReq pageInvoiceReq) {
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java

@@ -131,6 +131,21 @@ public class OrderInvoiceController {
         }
     }
 
+    /**
+     * 生成预制发票(非拆分场景)
+     * @param pageInvoiceReq
+     * @return
+     */
+    @PostMapping("/preInvoice")
+    public R preInvoice(@RequestBody PageInvoiceReq pageInvoiceReq) {
+        try {
+            return invoiceService.preInvoice(pageInvoiceReq);
+        } catch (Exception e) {
+            log.error("{}生成预制发票异常e:{}", LOGGER_MSG, e);
+            return R.error().put(OrderManagementConstant.MESSAGE, e.getMessage());
+        }
+    }
+
     /**
      * 订单编辑后开票
      * 优税小助手调用

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

@@ -1902,6 +1902,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
             processInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_0.getKey());
             processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey());
             processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey());
+            processInfo.setBzdh(newOrderExcel.getBzdh());
             orderExcel2CommonOrderInfo.setProcessInfo(processInfo);
             orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey());
             orderExcel2CommonOrderInfo.setNum(i);

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

@@ -520,6 +520,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
             oldOrderProcessInfo.setCheckTime(new Date());
         }
+        oldOrderProcessInfo.setBzdh(orderInfo.getBzdh());
 
         /**
          * 编辑后数据做下税分离,做订单校验,通过后再进行保存入库

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3487,6 +3487,7 @@ public class BeanTransitionUtils {
             ddtxxBO.setBZDH(req.getZBZDH());
             ddtxxBO.setXTLY(isinput.getSYSID());
             ddtxxBO.setGSDM(req.getBUKRS());
+            ddtxxBO.setENTID(deptEntity.getDeptId());
             ddtxxBO.setBHZT(ConfigureConstant.STRING_0);
             ddtxxBO.setYGXM(req.getPENAM());
             ddtxxBO.setKPPZH(req.getZKPPZH());