#

mrzhssss

2022-10-28 d0785c1420794a0a8be33893e1f1e93ac23da82d

#

 src/main/java/com/zy/asrs/controller/WrkMastController.java

@@ -188,7 +188,7 @@
        if (wrkMast.getIoType() != 107) {
            return R.error("工作档非捡料任务");
        }
        if (wrkMast.getWrkSts() != 14){
        if (wrkMast.getWrkSts() != 17){
            return R.error("盘点任务正在执行中,请等待设备运行结束后进行操作");
        }
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -284,5 +284,45 @@
        return R.ok("库存更新已成功");
    }

    @GetMapping("/wrkMast/pickToFill")
    public R pickToFill(String barcode){
        Date now = new Date();
        if (Cools.isEmpty(barcode)) {
            return R.error("托盘码为空,请检查");
        }
        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
        if (Cools.isEmpty(wrkMast)) {
            return R.error("无法通过托盘码找到该工作档,请检查托盘码是否正确");
        }
        if (wrkMast.getIoType() != 103) {
            return R.error("仅有捡料出库可以使用该功能");
        }
        if (wrkMast.getWrkSts() != 17) {
            return R.error("捡料出库未完成,请等待设备运行完成");
        }
        wrkMast.setIoType(101);
        wrkMast.setMemo("捡料转全板工作档");
        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
                .eq("wrk_no",wrkMast.getWrkNo()));
        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
        for (LocDetl locDetl : locDetls) {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(locDetl);
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setZpallet(wrkDetl.getBarcode());
            wrkDetl.setBarcode(wrkMast.getBarcode());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setAppeUser(1L);
            wrkDetl.setModiUser(1L);
            wrkDetlService.insert(wrkDetl);

        }
        locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
        return R.ok();
    }


}

 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java

@@ -68,4 +68,6 @@
    Double selectSumByMatnr(@Param("matnr") String matnr);

    List<LocDetl> selectGroupPage(Map<String, Object> param);

    List<LocDetl> selectByLocNo(@Param("locNo") String locNo);
}

 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -28,4 +28,5 @@

    int updateOrderNo(@Param("orderNo")String orderNo, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);

    void deleteByWrkNo(@Param("wrkNo") Integer wrkNo);
}

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -62,4 +62,6 @@
    Double selectSumByMatnr(String matnr);

    List<LocDetl> selectGroupPage(Map<String, Object> param, Integer curr, Integer limit);

    List<LocDetl> selectByLocNo(String locNo);
}

 src/main/java/com/zy/asrs/service/WrkDetlService.java

@@ -24,4 +24,5 @@

    boolean updateOrderNo(String orderNo, Integer wrkNo, String matnr, String batch);

    void deleteByWrkNo(Integer wrkNo);
}

 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java

@@ -133,6 +133,11 @@
        return this.baseMapper.selectGroupPage(param);
    }

    @Override
    public List<LocDetl> selectByLocNo(String locNo) {
        return this.baseMapper.selectByLocNo(locNo);
    }


    @Override
    public LocDetl selectItem(String locNo, String matnr, String batch) {

 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java

@@ -91,4 +91,9 @@
        return baseMapper.updateOrderNo(orderNo, wrkNo, matnr, batch) > 0;
    }

    @Override
    public void deleteByWrkNo(Integer wrkNo) {
        this.baseMapper.deleteByWrkNo(wrkNo);
    }

}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -412,5 +412,9 @@
        SELECT  *  FROM [dbo].[asr_loc_detl_group] WHERE 1 = 1
        <include refid="groupListCondition"></include>
    </select>
    <select id="selectByLocNo" resultMap="BaseResultMap">
        SELECT * FROM asr_loc_detl WHERE loc_no = #{locNo}

    </select>

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -70,6 +70,9 @@
        and matnr = #{matnr}
        <include refid="batchSeq"></include>
    </delete>
    <delete id="deleteByWrkNo">
        DELETE FROM asr_wrk_detl where wrk_no = #{wrkNo}
    </delete>

    <update id="updateAnfme">
        update asr_wrk_detl