库存字段优化 人工上架接口修改

skyouc

2025-04-03 3d2098353abe8044073c40ac6f6f7d6b474349b2

库存字段优化
人工上架接口修改

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java

@@ -95,10 +95,10 @@
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<StockItem> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(StockItem::getMatnrk, condition);
            wrapper.like(StockItem::getMaktx, condition);
        }
        stockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getMatnrk()))
                item -> vos.add(new KeyValVo(item.getId(), item.getMaktx()))
        );
        return R.ok().add(vos);
    }

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java

@@ -86,7 +86,7 @@
     * 物料标识
     */
    @ApiModelProperty(value= "物料标识")
    private String matnrId;
    private Long matnrId;

    /**
     * 物料编码
@@ -233,7 +233,7 @@

    public AsnOrderItem() {}

    public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.asnId = asnId;
        this.asnCode = asnCode;
        this.poDetlId = poDetlId;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java

@@ -58,7 +58,7 @@
     * 物料编码
     */
    @ApiModelProperty(value= "物料编码")
    private String code;
    private String matnrCode;


    @ApiModelProperty(value = "通知单明细标识")
@@ -68,7 +68,7 @@
     * 名称
     */
    @ApiModelProperty(value= "名称")
    private String matnrk;
    private String maktx;

    /**
     * 数量
@@ -269,8 +269,8 @@
        this.stockId = stockId;
        this.matnrId = matnrId;
        this.asnItemId = asnItemId;
        this.code = code;
        this.matnrk = matnrk;
        this.matnrCode = code;
        this.maktx = matnrk;
        this.anfme = anfme;
        this.workQty = workQty;
        this.qty = qty;

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java

@@ -129,7 +129,7 @@
                        .setPurUnit(item.getUnit())
                        .setMatnrCode(matnr.getCode())
                        .setMaktx(matnr.getName())
                        .setMatnrId(matnr.getId() + "");
                        .setMatnrId(matnr.getId());
                orderItems.add(orderItem);
            });
            if (!asnOrderItemService.saveBatch(orderItems)) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java

@@ -108,7 +108,7 @@
                    .setUnit(item.getStockUnit())
                    .setFieldsIndex(item.getFieldsIndex())
                    .setUnit(item.getStockUnit())
                    .setMatnrId(StringUtils.isNotBlank(item.getMatnrId()) ? Long.parseLong(item.getMatnrId()) : null)
                    .setMatnrId(item.getMatnrId())
                    .setMaktx(item.getMaktx())
                    .setMatnrCode(item.getMatnrCode());
            for (PakinItem waitPakinItem : waitPakin.getItems()) {