no message

skyouc

7 小时以前 9591d4a4184a76f2af997a47c3bd883beecb1ea2

no message

 src/main/java/com/zy/asrs/entity/TaskDetl.java

@@ -2,10 +2,12 @@

import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.service.MatService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
@@ -477,6 +479,15 @@
        return null;
    }

    public String getTag$() {
        MatService service = SpringUtils.getBean(MatService.class);
        Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
        if (Cools.isEmpty(order)){
            return null;
        }
        return order.getTagId$();
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";

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

@@ -656,6 +656,7 @@
                waitPakin.setAnfme(detlDto.getAnfme());
                waitPakin.setThreeCode(detlDto.getThreeCode());
                waitPakin.setStatus("Y");
                waitPakin.setSuppCode(detlDto.getStandby1());
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
@@ -1694,7 +1695,8 @@
                throw new CoolException("明细内容不存在！！");
            }

            Double v = stationDetl.getAnfme() - stationDetl.getWorkQty();
            Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;

            if (detlDto.getAnfme().compareTo(v) > 0) {
                throw new CoolException("组托上限为：" + stationDetl.getAnfme() + ", 已组托：" + stationDetl.getWorkQty() + ", 还可组托：" + v);
            }
@@ -1725,7 +1727,7 @@
                throw new CoolException("保存入库通知档失败");
            }

            Double v1 = stationDetl.getWorkQty() + detlDto.getAnfme();
            Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0 ;
            stationDetl.setWorkQty(v1);

            if (!basStationDetlService.updateById(stationDetl)) {
@@ -1735,6 +1737,19 @@
            if (v1.compareTo(stationDetl.getWorkQty()) >= 0) {
                if (!basStationDetlService.deleteById(stationDetl)) {
                    throw new CoolException("原始数据移除失败！");
                }
            }

            List<BasStationDetl> devNo = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", stationDetl.getDevNo()));
            if (Objects.isNull(devNo) || devNo.isEmpty()) {
                BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
                        .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
                        .eq("dev_no", stationDetl.getDevNo()));
                if (!Objects.isNull(station)) {
                    station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
                    if (!basStationService.updateById(station)) {
                        throw new CoolException("站点状态修改失败~！！");
                    }
                }
            }

@@ -1777,11 +1792,11 @@
            throw new CoolException("站点不存在!!");
        }

        station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
        if (!basStationService.updateById(station)) {
            throw new CoolException("站点状态修改失败!");
        }
        basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
//        station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
//        if (!basStationService.updateById(station)) {
//            throw new CoolException("站点状态修改失败!");
//        }
//        basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));

//        // 任务完成
//        task.setWrkSts(15L);
@@ -1974,6 +1989,7 @@
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setSuppCode(waitPakin.getSuppCode());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);

 src/main/webapp/static/js/common.js

@@ -227,6 +227,7 @@
    ,{field: 'specs', align: 'center',title: '规格', hide: false}
    ,{field: 'tag$', align: 'center',title: '零件类型', hide: false}
    ,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
    ,{field: 'suppCode', align: 'center',title: '供应商编码', hide: false}
    ,{field: 'length', align: 'center',title: '重量', hide: false}
    ,{field: 'volume', align: 'center',title: '尺寸', hide: false}
    ,{field: 'frozen$', align: 'center',title: '冻结否',hide: true,

 src/main/webapp/static/js/orderPakin/order.js

@@ -126,6 +126,7 @@
                            ,{field: 'anfme', align: 'center',title: '数量', hide: false}
                            ,{field: 'specs', align: 'center',title: '规格', hide: false}
                            ,{field: 'tag$', align: 'center',title: '零件类型', hide: false}
                            ,{field: 'suppCode', align: 'center',title: '供应商编码', hide: false}
                            ,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
                            ,{ field: 'anfme', title: '数量', align: 'center',hide: false}
                            ,{ field: 'workQty', title: '作业数量', align: 'center',hide: false }