#

zhou zhou

10 小时以前 a6884be9732bd7213faaee92f449725d263f66a0

#

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

@@ -13,6 +13,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.entity.Parameter;
@@ -46,6 +47,9 @@
    private WrkMastLogService wrkMastLogService;
    @Resource
    private WrkDetlLogService wrkDetlLogService;

    @Autowired
    private BasAreasService basAreasService;

    @RequestMapping(value = "/locMast/init/pwd")
    public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -277,6 +281,8 @@
//    @Transactional
    public R init(LocMastInitParam param) {
        try {
            BasAreas basAreas = basAreasService
                    .selectOne(new EntityWrapper<BasAreas>().eq("whs_type_id", LocAreaType.LOC_AREA_TYPE_CRN.type));
            List<LocMast> list = new ArrayList<>();
            BasWhsType basWhsType = basWhsTypeService.selectByIdentifying(param.getIdentifying());
            if (Cools.isEmpty(basWhsType)) {
@@ -322,6 +328,8 @@
                        locMast.setModiUser(getUserId());
                        locMast.setModiTime(now);
                        locMast.setWhsType(basWhsType.getId());
                        locMast.setAreaId(basAreas.getId());
                        locMast.setAreaName(basAreas.getName());
                        list.add(locMast);
                    }
                }

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

@@ -195,6 +195,12 @@
    @TableField("frozen_memo")
    private String frozenMemo;

    @TableField("area_id")
    private Long areaId;

    @TableField("area_name")
    private String areaName;


    public String getWhsType$(){
        BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);

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

@@ -761,6 +761,7 @@
                waitPakin.setZpallet(param.getBarcode()); // 托盘码
                waitPakin.setThreeCode(detlDto.getThreeCode());
                waitPakin.setSuppCode(detlDto.getStandby1());
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setIoStatus("N"); // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme()); // 数量
                waitPakin.setStatus("Y"); // 状态

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -141,6 +141,8 @@
                        } else {
                            locDetl = new LocDetl();
                            locDetl.sync(wrkDetl);
                            locDetl.setAreaId(locMast.getAreaId());
                            locMast.setAreaName(locMast.getAreaName());
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
                            locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码

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

@@ -246,7 +246,7 @@
    {field: 'matnr', align: 'center',title: '商品编号', sort:true}
    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'suppCode', align: 'center',title: '供应商编码', hide: false}
    ,{field: 'standby1', align: 'center',title: '供应商编码', hide: false}
    ,{field: 'threeCode', align: 'center',title: 'BS Code', hide: false}
    ,{field: 'tag$', align: 'center',title: '零件类型', hide: false}
    ,{field: 'batch', align: 'center',title: '批号', hide: true}