Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

tqs

2024-07-05 ed7804d6625640253b88084ddd49cc3350f8a349

Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

 zy-asrs-common/src/main/java/com/zy/asrs/common/utils/MatExcelListener.java

@@ -140,6 +140,16 @@
                throw new CoolException("保存商品信息失败，商品编码：" + excel.getMatnr());
            }
            total++;
        }else {
            matService.removeById(mat.getId());

            mat = excel;
            mat.setTagId(tagId);
            mat.setHostId(hostId);
            if (!matService.save(mat)) {
                throw new CoolException("保存商品信息失败，商品编码：" + excel.getMatnr());
            }
            total++;
        }
    }


 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java

@@ -4,7 +4,9 @@
import java.util.Date;

import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -333,6 +335,19 @@
        return null;
    }

    public String getOrderType() {
        if (Cools.isEmpty(this.orderNo)){
            return "";
        }
        OrderService orderService = SpringUtils.getBean(OrderService.class);
        DocTypeService docTypeService = SpringUtils.getBean(DocTypeService.class);
        Order order = orderService.selectByNo(orderNo, hostId);
        if (order != null) {
            return order.getDocType$();
        }
        return this.orderNo;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java

@@ -92,6 +92,45 @@
    }

    /**
     * 入库制令检测  -- 指令在库存里面借用批号字段batch
     * 1.可正常入库
     * 2.库存包含相同制令货物，是否进行补货
     * 3.工作档存在正在入库任务，拒绝入库
     */
    @RequestMapping("/pda/decrees/check")
    @ManagerAuth
    public R pdaDecreesCheck(@RequestParam String decrees){
        if (Cools.isEmpty(decrees)) {
            return R.error("制令不能为空");
        }
        Long hostId = getHostId();
        //查询是否有库存
        List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getBatch, decrees));
        //查询是否有正在工作的工作档
        List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getBatch, decrees));
        HashMap<String, Object> map = new HashMap<>();
        if(list.isEmpty() && wrkDetls.isEmpty()){
            map.put("status", 1);//可正常入库
        } else if (!wrkDetls.isEmpty()) {
            map.put("status", 3);//存在工作档，拒绝入库
        } else {
            //获取库存最少的一条记录
            Double anfme = 999999999D;
            LocDetl miniLocDetl = null;
            for (LocDetl locDetl : list) {
                if (locDetl.getAnfme() < anfme) {
                    anfme = locDetl.getAnfme();
                    miniLocDetl = locDetl;
                }
            }

            map.put("status", 2);//库存包含相同制令货物，是否进行补货
            map.put("data", miniLocDetl);//库存信息
        }
        return R.ok().add(map);
    }

    /**
     * 根据单号检索单据数据
     */
    @RequestMapping("/order/search/orderNo/auth")

 zy-asrs-wms/src/main/webapp/static/js/locDetl/locDetl.js

@@ -5,6 +5,7 @@
        {field: 'matnr', align: 'center',title: '商品编号', sort:true}
        ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
        ,{field: 'orderType', align: 'center',title: '单据类型', hide: false}
        ,{field: 'batch', align: 'center',title: '序列码', width: 300, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量', width: 100}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}