Преглед изворни кода

仓库业务->修改app查询库存总帐接口

caifc пре 3 година
родитељ
комит
19e7dd4fe9

+ 0 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWhgenlegController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
-import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -15,7 +14,6 @@ import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.dto.TWarehousebill;
 import com.ruoyi.reportManagement.excel.Whgenleg;
 import com.ruoyi.reportManagement.service.ITWhgenlegService;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -39,7 +39,6 @@ import com.ruoyi.shipping.domain.TFeeInvoice;
 import com.ruoyi.shipping.domain.TVessel;
 import com.ruoyi.shipping.domain.TVoyage;
 import com.ruoyi.shipping.excel.Account;
-import com.ruoyi.shipping.excel.DeriveInventoryExcel;
 import com.ruoyi.shipping.excel.ExportFinancial;
 import com.ruoyi.shipping.mapper.TFeeInvoiceMapper;
 import com.ruoyi.shipping.mapper.TVesselMapper;
@@ -73,7 +72,6 @@ import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 财务数据主Service业务层处理

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -427,7 +427,7 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
 
     @Override
     public List<Map<String, Object>> appWhGenLegList(TWhgenleg tWhgenleg) {
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list;
         TCustomerContact customerContact = new TCustomerContact();
         SysUser user = SecurityUtils.getLoginUser().getUser();
         if ("外部用户".equals(user.getDept().getDeptName())) {

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

@@ -7229,6 +7229,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             String bscorpno = billnoSerialServiceImpl.getCorpNo(warehousebillsDTO.getfCorpid(), time);
             warehousebillsDTO.setfBscorpno(bscorpno);
         }
+        warehousebillsDTO.setfDateChanged(DateUtils.getTimestamp(new Date()).toString() + (int) (Math.random() * 900) + 100);
         warehousebillsDTO.setCreateTime(new Date());
         warehousebillsDTO.setCreateBy(loginUser.getUsername());
         warehousebillsDTO.setfBsdeptid(loginUser.getUser().getDeptId());