#
luxiaotao1123
2021-03-02 bd789d6cafcccbba933dc9264adf46dab4a61ca0
#
2个文件已修改
10 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CustOrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
@@ -43,9 +44,12 @@
        if (!Cools.isEmpty(locDetls)) {
            result.addAll(locDetls);
        }
        List<Long> nodeIds = locDetls.stream().map(LocDetl::getNodeId).distinct().collect(Collectors.toList());
        List<LocDetl> locDetls1 = this.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr).eq("status", 1).orderBy("create_time"));
        if (!Cools.isEmpty(locDetls1)) {
            result.addAll(locDetls1);
        for (LocDetl locDetl : locDetls1) {
            if (!nodeIds.contains(locDetl.getNodeId())) {
                result.add(locDetl);
            }
        }
        return result;
    }
src/main/resources/mapper/CustOrderMapper.xml
@@ -19,7 +19,7 @@
    </resultMap>
    <update id="completeOrder">
    <update id="updateStatus">
        update man_cust_order set status = #{status} where 1=1 and number = #{number}
    </update>