#

Administrator

18 小时以前 8af4cdbdb52932dca5d16fbce42a2f6fad4e3b8b

#

 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java

@@ -422,7 +422,7 @@
                        }
                        Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
                        if (!Cools.isEmpty(weight)) {
                            Double val = Math.round((weight - 3) * 10000) / 10000.0;
                            Double val = Math.round((weight - 2.5) * 10000) / 10000.0;
                            //称重后，计算出真实长度
                            realQty = val * matnr.getVolume();
                            if (realQty<matnr.getSafeQty()){

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

@@ -949,10 +949,10 @@
            throw new CoolException("当前工作档已完成");
        }
        // 入库 + 库位转移
        if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType() == 11)) {
        if (wrkMast.getWrkSts() < 4 ) {
            wrkMast.setWrkSts(4L);
            WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()).eq("wrk_sts",15L));
            if (!Cools.isEmpty(wrkMast)) {
            if (!Cools.isEmpty(wrkMast) &&(wrkMast.getIoType()==1||wrkMast.getIoType()==11||wrkMast.getIoType()==10)) {
                mast.setOveMk("Y");
                wrkMast.setModiTime(new  Date());
                wrkMastService.updateById(mast);
@@ -1517,6 +1517,7 @@
        mast.setSourceLocNo(wrkMast.getLocNo());
        mast.setLocNo(locNo.getLocNo()); // 目标库位 = 出库时的源库位
        mast.setModiTime(now);
        mast.setWrkCode(workNo);
        mast.setModiUser(userId);
        if (!wrkMastService.insert(mast)) {
            return R.error("更新工作档数据状态失败");

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -80,7 +80,7 @@
     */
    @Scheduled(cron = "0/3 * * * * ? ")
    private synchronized void autoPubTasks() {
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)));
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", Arrays.asList(1L, 11L)).orderBy("io_pri",false).orderBy("appe_time", true));
        if (wrkMasts.isEmpty()) {
            return;
        }