#加字段+预留字段启用

zjj

2024-12-18 0278c966c1c32fbd60dd25ea3d375fa5d5f916ad

#加字段+预留字段启用

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

@@ -152,6 +152,15 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "预留1")
    private String temp1;
    @ApiModelProperty(value= "预留1")
    private String temp2;
    @ApiModelProperty(value= "预留1")
    private String temp3;
    @ApiModelProperty(value= "预留1")
    private String temp4;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

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

@@ -151,6 +151,15 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    @ApiModelProperty(value= "预留1")
    private String temp1;
    @ApiModelProperty(value= "预留1")
    private String temp2;
    @ApiModelProperty(value= "预留1")
    private String temp3;
    @ApiModelProperty(value= "预留1")
    private String temp4;

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
        switch (this.beBatch){

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

@@ -364,7 +364,9 @@
                    throw new CoolException("修改单据作业数量失败");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
                        , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                    assert one != null;
@@ -393,6 +395,14 @@
                waitPakin.setModiTime(now);
                waitPakin.setManu(detlDto.getMark()); //标记
                waitPakin.setOrigin(order.getItemName());//仓库
                waitPakin.setSupp(detlDto.getSuppName()); //供应商
                waitPakin.setSku(detlDto.getCustomer()); //客户名称
                waitPakin.setThreeCode(detlDto.getOrderNo()); //u8发过来的订单号
                waitPakin.setSuppCode(detlDto.getFromOrderNo()); //来源单号
                waitPakin.setTemp1(detlDto.getTemp1());
                waitPakin.setTemp2(detlDto.getTemp2());
                waitPakin.setTemp3(detlDto.getTemp3());
                waitPakin.setTemp4(detlDto.getTemp4());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

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

@@ -147,6 +147,10 @@
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName()); //供应商
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
@@ -289,6 +293,10 @@
            orderDetl.setManu(detlDto.getMark());
            orderDetl.setSupp(detlDto.getSuppName());
            orderDetl.setSku(detlDto.getCustomer());
            orderDetl.setTemp1(detlDto.getTemp1());
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }