1.更改导入库存时，计划净重、计划毛重为负数时，数据不显示逻辑；

2.更改费用明细当大请核撤销以及撤销审批时，数据被默认更改状态的逻辑

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

@@ -984,7 +984,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
             tWarehouseBillsMapper.warehouseApprovalUpdate(auditItems, fettle);
-            tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
+            // 下方注掉的接口，在大撤销请核时，会更改费用明细对应的数据状态，暂时废弃
+            // tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
             // 撤销审批时删除审批流任务明细从表对应数据
             revokeDeleteAID(auditItems.getActId(),auditItems.getBillId());
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {

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

@@ -424,26 +424,19 @@ public class TFeeServiceImpl implements ITFeeService {
             tFee = tFeeMapper.selectTFeeById(fPid);
             tFee.setSrcBillNo(tFee.getfBillno());
             // 删除从表
-            // tFeeDoMapper.deleteByFPid(fPid);
+            tFeeDoMapper.deleteByFPid(fPid);
         }
         //  财务从表
         if (StringUtils.isNotNull(tfeeDo)) {
             JSONArray jsonDrArray = JSONArray.parseArray(tfeeDo);
             List<TFeeDo> tFeeDoList = JSONObject.parseArray(jsonDrArray.toJSONString(), TFeeDo.class);
             for (TFeeDo tFeeDo : tFeeDoList) {
-                if (StringUtils.isNull(tFeeDo.getfId())) {
-                    tFeeDo.setfPid(fPid);
-                    tFeeDo.setCreateBy(loginUser.getUser().getUserName());
-                    tFeeDo.setCreateTime(new Date());
-                    tFeeDo.setfSrcBillno(tFeeDo.getfBillno());
-                    tFeeDo.setfStatus("2");
-                    tFeeDoMapper.insertTFeeDo(tFeeDo);
-                } else {
-                    // 走了修改
-                    tFeeDo.setUpdateBy(loginUser.getUser().getUserName());
-                    tFeeDo.setUpdateTime(new Date());
-                    tFeeDoMapper.updateTFeeDo(tFeeDo);
-                }
+                tFeeDo.setfPid(fPid);
+                tFeeDo.setCreateBy(loginUser.getUser().getUserName());
+                tFeeDo.setCreateTime(new Date());
+                tFeeDo.setfSrcBillno(tFeeDo.getfBillno());
+                tFeeDo.setfStatus("2");
+                tFeeDoMapper.insertTFeeDo(tFeeDo);
             }
         }
         List<FinancialTFeeDoExcel> list = tFeeDoMapper.selectFinancialTFeeDo(fPid);

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

@@ -5417,7 +5417,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebills.setfQty(itemInFo.getfQty());
         tWarehousebills.setfNetweight(itemInFo.getfNetweight());
         tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
-        tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L, new Date());
+        // 注释该接口，防止撤销请核时，出现将费用明细也撤销
+        // tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(tWarehousebills.getfId(), 2L, new Date());
         // 判断是否出库
         if (tWarehousebills.getfBilltype().equals(WarehouseTypeEnum.SJCK.getType())) {
             cancellationInStockFee(tWarehousebills);

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -706,6 +706,8 @@
             AND dict1.dict_type = 'data_trademodes'
             AND leg.f_qtyD != 0
             AND (leg.f_qtyblc > 0 OR leg.f_grossweightblc > 0 OR leg.f_netweightblc > 0)
+            AND leg.f_grossweightD >= 0
+            AND leg.f_netweightD >= 0
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>