Merge branch 'reBack' of http://58.87.71.213:13000/luminghui/sims-order-lxzy

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

@@ -97,6 +97,9 @@ public class YyOrderServiceImpl implements OrderService {
     @Resource
     private RedissonService redissonService;
 
+    @Value("${exculd.nsrsbh}")
+    private String exculdNsrsbh;
+
     //订单读入
     @Override
     public R orderRead(ReqParam reqParam) {
@@ -309,19 +312,27 @@ public class YyOrderServiceImpl implements OrderService {
             log.debug("cdlCodeList:{}", JSON.toJSONString(ddhList));
             for (String cdlCode : ddhList) {
                 DynamicContextHolder.push(nsrsbh);
-                List<InvoiceBpmmap> ddbhList = yyOrderMapper.getDdbh(cdlCode);
+                if (StringUtils.isNotBlank(exculdNsrsbh) && Arrays.asList(exculdNsrsbh.split(",")).contains(nsrsbh)){
-                log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList));
+                    NewTable newTableFull = new NewTable();
-                if (CollectionUtils.isNotEmpty(ddbhList)) {
+                    BeanUtil.copyProperties(newTable, newTableFull);
-                    for (InvoiceBpmmap invoiceBpmmap : ddbhList) {
+                    newTableFull.setCDLCode(cdlCode);
-                        NewTable newTableFull = new NewTable();
+                    DynamicContextHolder.push(ConfigureConstant.MAIN);
-                        BeanUtil.copyProperties(newTable, newTableFull);
+                    count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
-                        newTableFull.setBpmNo(invoiceBpmmap.getBpmno());
+                }else {
-                        newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno());
+                    List<InvoiceBpmmap> ddbhList = yyOrderMapper.getDdbh(cdlCode);
-                        newTableFull.setCDLCode(cdlCode);
+                    log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList));
-                        DynamicContextHolder.push(ConfigureConstant.MAIN);
+                    if (CollectionUtils.isNotEmpty(ddbhList)) {
-                        count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
+                        for (InvoiceBpmmap invoiceBpmmap : ddbhList) {
-                    }
+                            NewTable newTableFull = new NewTable();
+                            BeanUtil.copyProperties(newTable, newTableFull);
+                            newTableFull.setBpmNo(invoiceBpmmap.getBpmno());
+                            newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno());
+                            newTableFull.setCDLCode(cdlCode);
+                            DynamicContextHolder.push(ConfigureConstant.MAIN);
+                            count += tInvoiceInvmapMapper.insertBackMsg(newTableFull);
+                        }
 
+                    }
                 }
             }