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

zss

7 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -11,7 +11,6 @@
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
@@ -37,11 +36,16 @@
@RequiredArgsConstructor
public class ShippingInfoServiceImpl extends ServiceImpl<ShippingInfoMapper, ShippingInfo> implements ShippingInfoService {


    private final ShippingInfoMapper shippingInfoMapper;
    private final TempFileServiceImpl tempFileService;


    private final SalesLedgerProductMapper salesLedgerProductMapper;

    private final StockUtils stockUtils;

    private final CommonFileServiceImpl commonFileService;

    private final ApproveProcessServiceImpl approveProcessService;
    private final FileUtil fileUtil;