凯和财务业务

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -235,8 +235,8 @@ public class KHTWarehousebillsController extends BaseController
     }
     @PreAuthorize("@ss.hasPermi('warehouse:warehousebills:ruoYiVersionOrderList')")
     @Log(title = "凯和若依订单查询", businessType = BusinessType.DELETE)
-    @PostMapping("/ruoYiVersionOrderList")
-    public TableDataInfo ruoYiVersionOrderList(@RequestBody(required = false) TWarehouseBills tWarehouseBills){
+    @GetMapping("/ruoYiVersionOrderList")
+    public TableDataInfo ruoYiVersionOrderList(TWarehouseBills tWarehouseBills){
         startPage();
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         List<Map<String,Object>> warehouseBills = tWarehousebillsService.ruoYiVersionOrderList(loginUser,tWarehouseBills);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/finance/webVersionAccount.java

@@ -60,12 +60,9 @@ public class webVersionAccount extends BaseController {
      * @return
      */
     @Log(title = "网页版对账查询", businessType = BusinessType.INSERT)
-    @PostMapping("/webVersionChargeList")
-    public TableDataInfo webVersionChargeList(@RequestBody(required = false) TFee tFee) {
+    @GetMapping("/webVersionChargeList")
+    public TableDataInfo webVersionChargeList(TFee tFee) {
         startPage();
-        if (tFee == null){
-            tFee = new TFee();
-        }
         tFee.setfBilltype("KHDZ");
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         tFee.setCreateBy(loginUser.getUser().getUserName());
@@ -117,13 +114,10 @@ public class webVersionAccount extends BaseController {
      * @return
      */
     @Log(title = "网页版对账数据", businessType = BusinessType.INSERT)
-    @PostMapping("/webVersionList")
-    public TableDataInfo webVersionList(@RequestBody(required = false) TAccount tAccount) {
+    @GetMapping("/webVersionList")
+    public TableDataInfo webVersionList(TAccount tAccount) {
         //tFee.setfBilltype("KHDZ");
         startPage();
-        if (tAccount == null){
-            tAccount = new TAccount();
-        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         tAccount.setCreateBy(loginUser.getUser().getUserName());
         List<Map<String, Object>> list = tFeeService.webVersionList(tAccount);
@@ -154,12 +148,9 @@ public class webVersionAccount extends BaseController {
      * @param tFee
      * @return
      */
-    @PostMapping("/webVersionInvoice")
-    public TableDataInfo webVersionInvoice(@RequestBody(required = false) TFee tFee) {
+    @GetMapping("/webVersionInvoice")
+    public TableDataInfo webVersionInvoice(TFee tFee) {
         //tFee.setfBilltype("KHDZ");
-        if (tFee == null){
-            tFee = new TFee();
-        }
         startPage();
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         tFee.setCreateBy(loginUser.getUser().getUserName());

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -421,6 +421,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             return ajaxResult;
                         }
                     }else if (auditItems.getActId()== 410 ){
+                        if (StringUtils.isEmpty(auditItems.getRefno3())){
+                            return AjaxResult.error("提单号不能为空");
+                        }
                         if ("T".equals(at.getIffinalItem())) {
                             fettle = 6L;
                         } else if ("F".equals(at.getIffinalItem())) {
@@ -433,6 +436,16 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                             return ajaxResult;
                         }
+                        TWarehouseBills tWarehouseBills = new TWarehouseBills();
+                        tWarehouseBills.setfId(auditItems.getBillId());
+                        tWarehouseBills.setfMblno(auditItems.getRefno3());
+                        AjaxResult orderMessage = tWarehouseBillsService.updateOrderMessage(tWarehouseBills);
+                        String orderMessageCode = orderMessage.get("code").toString();
+                        if ("500".equals(orderMessageCode)) {
+                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                            return orderMessage;
+                        }
+
                     }else if (auditItems.getActId()== 420 ){
                         if ("T".equals(at.getIffinalItem())) {
                             fettle = 11L;

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -804,7 +804,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 存储业务类型（业务类型）
             auditItems.setRefno2(warehouseBills.getfBilltype());
             // 存储提单号（提单号）
-            auditItems.setRefno3(warehouseBills.getfMblno());
+            if (StringUtils.isNotEmpty(warehouseBills.getfMblno())){
+                auditItems.setRefno3(warehouseBills.getfMblno());
+            }else {
+                auditItems.setRefno3(warehouseBills.getfBillno());
+            }
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(SecurityUtils.getUsername());
             auditItems.setSendTime(new Date());
@@ -939,7 +943,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 存储业务类型（业务类型）
             auditItems.setRefno2(tWarehouseBills.getfBilltype());
             // 存储提单号（提单号）
-            //auditItems.setRefno3(warehouseBills.getfMblno());
+            auditItems.setRefno3(tWarehouseBills.getfMblno());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(SecurityUtils.getUsername());
             auditItems.setSendTime(new Date());
@@ -1738,7 +1742,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("提单号不能为空");
         }
         TWarehouseBills mblno = tWarehouseBillsMapper.selectTWarehousebillsfMblno(warehouseBills);
-        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(mblno.getfId())) {
+        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(warehouseBills.getfId())) {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
@@ -1855,7 +1859,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("提单号不能为空");
         }
         TWarehouseBills mblno = tWarehouseBillsMapper.selectTWarehousebillsfMblno(warehouseBills);
-        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(mblno.getfId())) {
+        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(warehouseBills.getfId())) {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
@@ -1936,7 +1940,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 存储业务类型（业务类型）
             auditItems.setRefno2(tWarehouseBills.getfBilltype());
             // 存储提单号（提单号）
-            //auditItems.setRefno3(warehouseBills.getfMblno());
+            auditItems.setRefno3(tWarehouseBills.getfMblno());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
             auditItems.setSendName(SecurityUtils.getUsername());
             auditItems.setSendTime(new Date());
@@ -1960,7 +1964,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     public AjaxResult updateOrderMessage(TWarehouseBills tWarehouseBills) {
         TWarehouseBills mblno = tWarehouseBillsMapper.selectTWarehousebillsfMblno(tWarehouseBills);
-        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(mblno.getfId())) {
+        if (StringUtils.isNotNull(mblno) && !mblno.getfId().equals(tWarehouseBills.getfId())) {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(tWarehouseBills.getfId());