Merge remote-tracking branch 'origin/dev' into dev

mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java

@@ -532,7 +532,14 @@ public class BillManageApplicationService {
         return result;
     }
 
-
+    public boolean synchronousNc(String businessDocumentDetaliIds)
+    {
+        return billManageDomainService.synchronousNc(businessDocumentDetaliIds);
+    }
+    public boolean synchronousNcSK(String businessDocumentDetaliIds)
+    {
+        return billManageDomainService.synchronousNcSK(businessDocumentDetaliIds);
+    }
 
 
 

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java

@@ -509,4 +509,14 @@ public class BillManageDomainService {
     public List<BillManage> billAnalysisList(QueryWrapper<BillManage> queryWrapper) {
         return billManageService.list(queryWrapper);
     }
+
+    public boolean synchronousNc(String businessDocumentDetaliIds)
+    {
+        return billManageService.synchronousNc(businessDocumentDetaliIds);
+    }
+
+    public boolean synchronousNcSK(String businessDocumentDetaliIds)
+    {
+        return billManageService.synchronousNcSK(businessDocumentDetaliIds);
+    }
 }

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java

@@ -161,6 +161,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
         BillManage billManage = billManageMapper.selectById(bmsInvoiceListAddDTO.getBillManageId());
         if (billManage != null) {
             billManage.setIsInvoice(1);
+            billManage.setInvoiceId(bmsInvoiceList.getId().toString());
             billManageMapper.updateById(billManage);
         }
         /*AjaxResult ajaxResult = financeServiceFeign.editIsInvoice(transportationId,1,bmsInvoiceList.getId(),"",bmsInvoiceList.getApplyNumber());
@@ -337,6 +338,14 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
             bmsMakeOutInvoice.setInvoiceValue(invoiceValue);
             bmsMakeOutInvoiceMapper.insert(bmsMakeOutInvoice);
         }
+        Long id = bmsInvoiceList.getId();
+        List<BillManage> billManages = billManageMapper.selectList(new QueryWrapper<BillManage>().lambda().eq(BillManage::getInvoiceId, id.toString()));
+        if (ObjectUtil.isNotNull(billManages) && billManages.size() > 0) {
+            for (BillManage billManage : billManages) {
+                billManage.setIsInvoice(2);
+                billManageMapper.updateById(billManage);
+            }
+        }
         this.updateById(bmsInvoiceList);
 
 

mhd_bms/src/main/java/com/mhd/bms/interfaces/facadeApi/BillManageApi.java

@@ -292,6 +292,41 @@ public class BillManageApi extends BaseController{
 
 
 
+    /**
+     * 应收账单应收单同步用户nc65
+     */
+    @Log(title = "应收账单应收单同步用户nc65", description = "应收账单应收单同步用户nc65", businessType = BusinessType.OTHER)
+    @ApiOperation("应收账单应收单同步用户nc65")
+    @GetMapping(value = "/synchronousNc")
+    public AjaxResult synchronousNc(@RequestParam(name="reconciliationId") String reconciliationId)
+    {
+        try{
+            return AjaxResult.success(billManageApplicationService.synchronousNc(reconciliationId));}
+        catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 应收账单收款单同步用户nc65
+     */
+    @Log(title = "应收账单收款单同步用户nc65", description = "应收账单收款单同步用户nc65", businessType = BusinessType.OTHER)
+    @ApiOperation("应收账单收款单同步用户nc65")
+    @GetMapping(value = "/synchronousNcSK")
+    public AjaxResult synchronousNcSK(@RequestParam(name="reconciliationId") String reconciliationId)
+    {
+        try{
+            return AjaxResult.success(billManageApplicationService.synchronousNcSK(reconciliationId));
+        } catch (Exception e){
+            e.printStackTrace();
+            return AjaxResult.error(e.getMessage());
+        }
+
+    }
+
+
+
 
 
 }