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

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

@@ -204,7 +204,7 @@ public class InvoiceServiceImpl implements InvoiceService {
             });
         }
         if(consumerList.size()>0){
-            return R.error(ConfigureConstant.STRING_9001, "校验客户提示",consumerList);
+            return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList);
         }else if((StrUtil.isBlank(pageInvoiceReq.getConfirmZnfm()) || !ConfigureConstant.STRING_0.equals(pageInvoiceReq.getConfirmZnfm())) &&  confirmList.size()>0){
             return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList);
         }else if(djOverflowList.size() > 0){

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

@@ -856,14 +856,11 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                 processInfo.setYzfp(ddtxx.getYZFP());
                 processInfo.setOriginDdh(ddtxx.getDDH());
                 processInfo.setOriginOrderId(processInfo.getOrderInfoId());
-                processInfo.setKb(insertOrderItem.get(0).get(0).getKb());
+                processInfo.setKb(ddmxxx.get(0).getKB());
             }
             for (OrderItemInfo itemInfo : insertOrderItem.get(0)) {
                 itemInfo.setPh(ddmxxx.get(0).getPH());
                 itemInfo.setKb(ddmxxx.get(0).getKB());
-                //TODO lfl 这两在哪赋值？
-                itemInfo.setZnfm("");
-                itemInfo.setTswl("");
             }
             //根据配置拼接备注信息
             InvoiceRemarkSet invoiceRemarkSet = new InvoiceRemarkSet();