root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:aps导出到原料需求，原材料编号和到货时间相同且同一天的多个订单自动合并成一个原料需求。

Browse Source
This commit is contained in:
baoge
2023-09-19 22:02:33 +08:00
parent 532b900347
commit 223f437338
4 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfDemandorderMapper.xml
View File

@@ -38,7 +38,7 @@
)
</if>
</where>
order by po.id desc
order by po.ask_time
</select>
<select id="queryAll" resultType="java.util.Map">
@@ -79,7 +79,7 @@
)
</if>
</where>
order by po.id desc
order by po.ask_time
</select>
<select id="updateSemirealSpec">

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
View File

@@ -38,7 +38,7 @@
)
</if>
</where>
order by po.id desc
order by po.ask_time
</select>
<select id="queryAll" resultType="java.util.Map">
@@ -86,7 +86,7 @@
)
</if>
</where>
order by po.id desc
order by po.ask_time
</select>
<select id="queryTransitQty" resultType="java.math.BigDecimal">

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfDemandorderServiceImpl.java
View File

@@ -1,6 +1,4 @@
package org.nl.wms.pcs_manage.service.purchase.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
@@ -15,7 +13,6 @@ import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
import org.nl.wms.masterdata_manage.service.material.dao.mapper.MdMeMaterialbaseMapper;
import org.nl.wms.pcs_manage.PCSEnum;
@@ -28,7 +25,6 @@ import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMappe
import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery;
import org.nl.wms.storage_manage.CHECKEnum;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
View File

@@ -1,13 +1,10 @@
package org.nl.wms.pcs_manage.service.purchase.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,28 +12,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import lombok.Data;
import org.apache.poi.hpsf.Decimal;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.tools.service.dto.LocalStorageDto;
import org.nl.wms.pcs_manage.PCSEnum;
import org.nl.wms.pcs_manage.service.purchase.IPcsIfDemandorderService;
import org.nl.wms.pcs_manage.service.purchase.IPcsIfPurchaseorderService;
import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfDemandorder;
import org.nl.wms.pcs_manage.service.purchase.dao.PcsIfPurchaseorder;
import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfDemandorderMapper;
import org.nl.wms.pcs_manage.service.purchase.dao.mapper.PcsIfPurchaseorderMapper;
import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery;
import org.nl.wms.storage_manage.CHECKEnum;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -48,8 +36,6 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import static org.nl.modules.common.utils.DateUtil.*;
@@ -67,8 +53,6 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl<PcsIfPurchaseorde
@Resource
private PcsIfPurchaseorderMapper purchaseorderMapper;
@Resource
private PcsIfDemandorderMapper demandorderMapper;
@Resource
private IPcsIfDemandorderService pcsIfDemandorderService;
@Override