parent: 2be45506 | 补丁 | 提交 | ignore whitespace
mrzhssss
2022-03-16 c445cc6b68ee932bbcb3b3389b4298aaf8b291e0 
Merge remote-tracking branch 'origin/master'
4个文件已修改
193 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/entity/Order.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderDetlMapper.xml 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/zy/cloud/wms/manager/entity/Order.java


@@ -7,6 +7,9 @@


import com.core.common.Cools;


import com.core.common.SpringUtils;


import io.swagger.annotations.ApiModelProperty;


import lombok.AllArgsConstructor;


import lombok.Data;


import lombok.NoArgsConstructor;


import zy.cloud.wms.manager.service.CstmrService;


import zy.cloud.wms.manager.service.DocTypeService;


import zy.cloud.wms.manager.service.ItemService;


@@ -20,6 +23,9 @@


import java.text.SimpleDateFormat;


import java.util.Date;




@Data


@NoArgsConstructor


@AllArgsConstructor


@TableName("man_order")


public class Order implements Serializable {




@@ -268,45 +274,56 @@


    @ApiModelProperty(value= "备注")


    private String memo;




    public Order() {}


    /**


     * 订单编号


     */


    @ApiModelProperty(value= "波次编号")


    @TableField("wave_no")


    private String waveNo;




    public Order(Long hostId, String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {


        this.hostId = hostId;


        this.uuid = uuid;


        this.orderNo = orderNo;


        this.orderTime = orderTime;


        this.docType = docType;


        this.itemId = itemId;


        this.itemName = itemName;


        this.allotItemId = allotItemId;


        this.defNumber = defNumber;


        this.number = number;


        this.cstmr = cstmr;


        this.cstmrName = cstmrName;


        this.tel = tel;


        this.operMemb = operMemb;


        this.totalFee = totalFee;


        this.discount = discount;


        this.discountFee = discountFee;


        this.otherFee = otherFee;


        this.actFee = actFee;


        this.payType = payType;


        this.salesman = salesman;


        this.accountDay = accountDay;


        this.postFeeType = postFeeType;


        this.postFee = postFee;


        this.payTime = payTime;


        this.sendTime = sendTime;


        this.shipName = shipName;


        this.shipCode = shipCode;


        this.settle = settle;


        this.status = status;


        this.createBy = createBy;


        this.createTime = createTime;


        this.updateBy = updateBy;


        this.updateTime = updateTime;


        this.memo = memo;


    }


//    public Order() {}




//    public Order(Long hostId, String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,


//                 String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,


//                 Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,


//                 Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,


//                 Long updateBy,Date updateTime,String memo, String waveNo) {


//        this.hostId = hostId;


//        this.uuid = uuid;


//        this.orderNo = orderNo;


//        this.orderTime = orderTime;


//        this.docType = docType;


//        this.itemId = itemId;


//        this.itemName = itemName;


//        this.allotItemId = allotItemId;


//        this.defNumber = defNumber;


//        this.number = number;


//        this.cstmr = cstmr;


//        this.cstmrName = cstmrName;


//        this.tel = tel;


//        this.operMemb = operMemb;


//        this.totalFee = totalFee;


//        this.discount = discount;


//        this.discountFee = discountFee;


//        this.otherFee = otherFee;


//        this.actFee = actFee;


//        this.payType = payType;


//        this.salesman = salesman;


//        this.accountDay = accountDay;


//        this.postFeeType = postFeeType;


//        this.postFee = postFee;


//        this.payTime = payTime;


//        this.sendTime = sendTime;


//        this.shipName = shipName;


//        this.shipCode = shipCode;


//        this.settle = settle;


//        this.status = status;


//        this.createBy = createBy;


//        this.createTime = createTime;


//        this.updateBy = updateBy;


//        this.updateTime = updateTime;


//        this.memo = memo;


//    }




//    Order order = new Order(


//            null,    // 编号[非空]




 src/main/java/zy/cloud/wms/manager/entity/OrderDetl.java


@@ -7,6 +7,9 @@


import com.core.common.Cools;


import com.core.common.SpringUtils;


import io.swagger.annotations.ApiModelProperty;


import lombok.AllArgsConstructor;


import lombok.Data;


import lombok.NoArgsConstructor;


import zy.cloud.wms.manager.service.OrderService;


import zy.cloud.wms.system.entity.Host;


import zy.cloud.wms.system.entity.User;


@@ -17,6 +20,9 @@


import java.text.SimpleDateFormat;


import java.util.Date;




@Data


@NoArgsConstructor


@AllArgsConstructor


@TableName("man_order_detl")


public class OrderDetl implements Serializable {




@@ -42,6 +48,13 @@


    @ApiModelProperty(value= "订单内码")


    @TableField("order_id")


    private Long orderId;




    /**


     * 订单编号


     */


    @ApiModelProperty(value= "订单编号")


    @TableField("order_no")


    private String orderNo;




    /**


     * 数量


@@ -169,56 +182,32 @@


    @ApiModelProperty(value= "备注")


    private String memo;




    public OrderDetl() {}




    public OrderDetl(Long hostId, Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {


        this.hostId = hostId;


        this.orderId = orderId;


        this.anfme = anfme;


        this.matnr = matnr;


        this.maktx = maktx;


        this.name = name;


        this.specs = specs;


        this.model = model;


        this.batch = batch;


        this.unit = unit;


        this.barcode = barcode;


        this.supplier = supplier;


        this.unitPrice = unitPrice;


        this.itemNum = itemNum;


        this.count = count;


        this.weight = weight;


        this.status = status;


        this.createBy = createBy;


        this.createTime = createTime;


        this.updateBy = updateBy;


        this.updateTime = updateTime;


        this.memo = memo;


    }




//    OrderDetl orderDetl = new OrderDetl(


//            null,    // 订单内码


//            null,    // 数量


//            null,    // 商品编码


//            null,    // 商品名称


//            null,    // 名称


//            null,    // 规格


//            null,    // 型号


//            null,    // 批号


//            null,    // 单位


//            null,    // 商品条码


//            null,    // 供应商


//            null,    // 单价


//            null,    // 品项数


//            null,    // 数量


//            null,    // 重量


//            null,    // 状态


//            null,    // 添加人员


//            null,    // 添加时间


//            null,    // 修改人员


//            null,    // 修改时间


//            null    // 备注


//    );


//    public OrderDetl() {}


//


//    public OrderDetl(Long hostId, Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {


//        this.hostId = hostId;


//        this.orderId = orderId;


//        this.anfme = anfme;


//        this.matnr = matnr;


//        this.maktx = maktx;


//        this.name = name;


//        this.specs = specs;


//        this.model = model;


//        this.batch = batch;


//        this.unit = unit;


//        this.barcode = barcode;


//        this.supplier = supplier;


//        this.unitPrice = unitPrice;


//        this.itemNum = itemNum;


//        this.count = count;


//        this.weight = weight;


//        this.status = status;


//        this.createBy = createBy;


//        this.createTime = createTime;


//        this.updateBy = updateBy;


//        this.updateTime = updateTime;


//        this.memo = memo;


//    }




    public Long getId() {


        return id;


@@ -262,6 +251,14 @@


        this.orderId = orderId;


    }




    public String getOrderNo() {


        return orderNo;


    }




    public void setOrderNo(String orderNo) {


        this.orderNo = orderNo;


    }




    public Double getAnfme() {


        return anfme;


    }




 src/main/resources/mapper/OrderDetlMapper.xml


@@ -7,6 +7,7 @@


        <id column="id" property="id" />


        <result column="host_id" property="hostId" />


        <result column="order_id" property="orderId" />


        <result column="order_no" property="orderNo" />


        <result column="anfme" property="anfme" />


        <result column="matnr" property="matnr" />


        <result column="maktx" property="maktx" />




 src/main/resources/mapper/OrderMapper.xml


@@ -40,7 +40,7 @@


        <result column="update_by" property="updateBy" />


        <result column="update_time" property="updateTime" />


        <result column="memo" property="memo" />




        <result column="wave_no" property="waveNo" />


    </resultMap>




    <update id="updateSettle">