2022年12月1日16:26:38

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -2431,8 +2431,9 @@ public class TFeeServiceImpl implements ITFeeService {
                     }
                     vo.setReceivableFQty(feeVOD.getFQty());
                     vo.setReceivablePrice(feeVOD.getPrice());
-                    WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOD.getfBilltype(), "storageType");
-                    vo.setfBilltype(storageType.getName());
+                    /*WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOD.getfBilltype(), "storageType");
+                    vo.setfBilltype(storageType.getName());*/
+                    vo.setfBilltype(feeVOD.getFFeesName());
                     vo.setFBillingDays(feeVOD.getFBillingDays());
                 }
                 if (ObjectUtils.isNotNull(feeVOC)) {
@@ -2442,8 +2443,9 @@ public class TFeeServiceImpl implements ITFeeService {
                     } else {
                         vo.setCopeWithAmount(C);
                     }
-                    WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOC.getfBilltype(), "storageType");
-                    vo.setFBilltypeC(storageType.getName());
+                   /* WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOC.getfBilltype(), "storageType");
+                    vo.setFBilltypeC(storageType.getName());*/
+                    vo.setfBilltype(feeVOC.getFFeesName());
                     vo.setCopeWithFQty(feeVOC.getFQty());
                     vo.setCopeWithPrice(feeVOC.getPrice());
                 }
@@ -2497,8 +2499,9 @@ public class TFeeServiceImpl implements ITFeeService {
                     }
                     generalLedgerDetailTotalExcel.setReceivableFQty(feeVOD.getFQty());
                     generalLedgerDetailTotalExcel.setReceivablePrice(feeVOD.getPrice());
-                    WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOD.getfBilltype(), "storageType");
-                    generalLedgerDetailTotalExcel.setFBilltype(storageType.getName());
+                    /*WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOD.getfBilltype(), "storageType");
+                    generalLedgerDetailTotalExcel.setFBilltype(storageType.getName());*/
+                    generalLedgerDetailTotalExcel.setFBilltype(feeVOD.getFFeesName());
                     generalLedgerDetailTotalExcel.setFBillingDays(feeVOD.getFBillingDays());
                 }
                 if (ObjectUtils.isNotNull(feeVOC)) {
@@ -2508,8 +2511,9 @@ public class TFeeServiceImpl implements ITFeeService {
                     } else {
                         generalLedgerDetailTotalExcel.setCopeWithAmount(C);
                     }
-                    WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOC.getfBilltype(), "storageType");
-                    generalLedgerDetailTotalExcel.setFBilltypeC(storageType.getName());
+                    /*WarehouseTypeEnum storageType = WarehouseTypeEnum.fromTypeAndBusinessType(feeVOC.getfBilltype(), "storageType");
+                    generalLedgerDetailTotalExcel.setFBilltypeC(storageType.getName());*/
+                    generalLedgerDetailTotalExcel.setFBilltypeC(feeVOC.getFFeesName());
                     generalLedgerDetailTotalExcel.setCopeWithFQty(feeVOC.getFQty());
                     generalLedgerDetailTotalExcel.setCopeWithPrice(feeVOC.getPrice());
                 }

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

@@ -4498,7 +4498,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                             .addHeader("X-RC-SignType", "SHA256")
                             .addHeader("X-RC-RequestTime", requestTime)
                             .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
-                            .url(feedbackConfig1.getConfigKey() + CcbConstants.IN_URL)
+                            .url(feedbackConfig1.getConfigValue() + CcbConstants.IN_URL)
                             .method("post", RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                             .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                             .build();
@@ -4876,7 +4876,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 .addHeader("X-RC-SignType", "SHA256")
                                 .addHeader("X-RC-RequestTime", requestTime)
                                 .addHeader("X-RC-RLF-Uid", CcbConstants.PLATFORM_ID)
-                                .url(feedbackConfig1.getConfigKey() + CcbConstants.OUT_URL)
+                                .url(feedbackConfig1.getConfigValue() + CcbConstants.OUT_URL)
                                 .post(RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), JsonUtil.toJson(rsp)))
                                 .build();
 

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

@@ -78,7 +78,7 @@ public class WarehouseBillsCcbServiceImpl implements IWarehouseBillsCcbService {
                 return AjaxResult.error("客户不存在！");
             }
 
-            TGoods goods = goodsMapper.getGoodsByName(item.getCargoName());
+            TGoods goods = goodsMapper.getGoodsByNo(item.getCargoNo());
             TGoods goods1 = new TGoods();
             if (ObjectUtil.isNull(goods)) {
                 String type = "";
@@ -93,12 +93,13 @@ public class WarehouseBillsCcbServiceImpl implements IWarehouseBillsCcbService {
                 }
                 String dictValue = sysDictData.selectDictValue("data_goods_category", type);
                 if (ObjectUtil.isNotNull(dictValue)) {
-                    goods1.setfTypeid(Long.getLong(dictValue));
+                    goods1.setfTypeid(Long.parseLong(dictValue));
                 } else {
                     goods1.setfTypeid(999l);
                 }
                 goods1.setfName(item.getCargoName());
                 goods1.setfNo(item.getCargoNo());
+
                 goodsMapper.insertTGoods(goods1);
             } else {
                 goods1.setfId(goods.getfId());

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsfeesMapper.xml

@@ -951,7 +951,7 @@
             resultType="com.ruoyi.warehouseBusiness.excel.QueryMenu">
         SELECT
         tc.f_name AS corpName,
-        tf.f_mblno AS fMblno,
+        tw.f_mblno AS fMblno,
         IF(tf.f_billtype = 'SJRK' || tf.f_billtype = 'SJCK' || tf.f_billtype = 'CKDB' || tf.f_billtype = 'HQZY' || tf.f_billtype = 'KCZZ',tf.f_bsdate, null) AS fBsdate,
         tf.f_review_date AS fReviewDate,
         te.f_name AS feeName,
@@ -1033,7 +1033,7 @@
     <select id="selectBillDetailsSubItemNew" parameterType="TWarehousebillsfees" resultType="map">
         select
         twf.f_pid as fId,
-        twf.f_mblno as fMblno,
+        tw.f_mblno as fMblno,
         dict.dict_label as fBusinesstype,
         CASE
         WHEN twf.f_billtype = 'SJRK' THEN '入库'
@@ -1056,7 +1056,7 @@
         twf.f_amount as fAmount,
         twf.create_by as createBy,
         date_format(twf.f_chargedate, '%Y-%m-%d') fChargedate,
-        date_format(twf.f_stlamount_date, '%Y-%m-%d') fStlamountdate,
+        date_format(twf.f_billing_deadline, '%Y-%m-%d') fStlamountdate,
         th.f_name as fhName,
         twf.f_dc as fDc,
         twf.remark as remark