自动化立体仓库 - WMS系统
野心家
2023-09-04 410ae0faceda3c5f0dd3593f6c781e79f4714849
电视机显示
7个文件已修改
39 ■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/PackQualifiedService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PackQualifiedMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java
@@ -20,7 +20,7 @@
    Integer selectCurrentQuantity1(@Param("data1") Date data1,@Param("data2") Date data2);
    Integer selectCurrentQuantity21(@Param("data1") Date data1,@Param("data2") Date data2);
    void insertPackQualified(@Param("now")Date now);
    void insertUnPackQualified(@Param("now")Date now);
    void insertPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
    void insertUnPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
}
src/main/java/com/zy/asrs/service/PackQualifiedService.java
@@ -12,5 +12,5 @@
    Integer selectTotal1(Date data1,Date data2);
    Integer selectCurrentQuantity1(Boolean sign,Date data1,Date data2);
    public void insertPackQualified(boolean qualified, Date now);
    public void insertPackQualified(boolean qualified, Date now,String Pack);
}
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -817,7 +817,8 @@
    @Override
    @Transactional
    public List<LocMast> packTestBasicInformation() {
        List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
        List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
                .and().ne("loc_sts","X"));
        for (LocMast locMast:locMasts) {
            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
            if(Cools.isEmpty(locDetl)){
src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java
@@ -37,11 +37,13 @@
    }
    @Override
    public void insertPackQualified(boolean qualified, Date now){
    public void insertPackQualified(boolean qualified, Date now,String Pack){
        if (qualified){
            this.baseMapper.insertPackQualified(now);
            this.baseMapper.insertPackQualified(now,Pack);
        }else{
            this.baseMapper.insertUnPackQualified(now,Pack);
        }
        this.baseMapper.insertUnPackQualified(now);
    };
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -44,7 +44,7 @@
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("fire_status", 1)
                    .eq("loc_sts", "F"));
            Integer ioType = 101;   //移库
            Integer ioType = 101;   //出库
            Date now = new Date();
            //优先级99,移库到0102501
            for(LocMast locMast : locMasts){
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -180,7 +180,7 @@
                            }
                        }
                        //入库标记
                        packQualifiedService.insertPackQualified(true,new Date());
                        packQualifiedService.insertPackQualified(true,new Date(),wrkDetls.get(0).getMatnr());
                        //2.入库完成上报
                        CombParam combParam = new CombParam();
                        combParam.setPackNo(wrkDetls.get(0).getMatnr());
@@ -389,15 +389,15 @@
                        if (locMast.getLocType1().equals((short)4)){
                            locMast.setPackStatus(4); //4:NG
                            //入库标记
                            packQualifiedService.insertPackQualified(true,new Date());
                            packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
                            //出库标记
                            packQualifiedService.insertPackQualified(false,new Date());
                            packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
                        }else {
                            locMast.setPackStatus(5); //5:静置中
                            //入库标记
                            packQualifiedService.insertPackQualified(true,new Date());
                            packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
                            //出库标记
                            packQualifiedService.insertPackQualified(false,new Date());
                            packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
                        }
                        sign=true;
                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -517,7 +517,7 @@
                            return FAIL.setMsg("全板出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }else{
                            //出库标记
                            packQualifiedService.insertPackQualified(false,new Date());
                            packQualifiedService.insertPackQualified(false,new Date(),wrkDetls101.get(0).getMatnr());
                            //2.出库完成上报
                           CombParam combParam = new CombParam();
                            combParam.setPackNo(wrkDetls101.get(0).getMatnr());
src/main/resources/mapper/PackQualifiedMapper.xml
@@ -62,12 +62,12 @@
    </select>
    <insert id="insertPackQualified">
        insert into man_pack_qualified(qualified,unqualified,create_time,status)
        values(1,0,#{now},2)
        insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
        values(1,0,#{now},2,#{Pack})
    </insert>
    <insert id="insertUnPackQualified">
        insert into man_pack_qualified(qualified,unqualified,create_time,status)
        values(0,1,#{now},2)
        insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
        values(0,1,#{now},2,#{Pack})
    </insert>
</mapper>