#1

lsh

昨天 d1be26f8d8196716257de0d3b09daa83a62bfffe

#1

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

@@ -114,13 +114,14 @@
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.like("owner", condition);
        wrapper.eq("status", 1);
        Page<LocOwner> page = locOwnerService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocOwner locOwner : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", locOwner.getId());
            map.put("value", locOwner.getId());
            map.put("value", locOwner.getOwner());
            result.add(map);
        }
        return R.ok(result);

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

@@ -42,6 +42,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private LocOwnerService locOwnerService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -113,6 +115,12 @@
                status = (docType.getPakin() == 1 ? 1 :  2 );
            }
        }
        LocOwner locOwner = null;
        if (!Cools.isEmpty(param.getOwnerId())) {
            locOwner = locOwnerService.selectById(param.getOwnerId());
        } else {
            locOwner = locOwnerService.selectById(1);
        }

        Order order = orderService.selectByNo(param.getOrderNo());
        if (order != null) {
@@ -125,12 +133,12 @@
                DateUtils.convert(now),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getStandby1(),    //项目名称 客户PO号
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                locOwner.getOwnerUuid(),    // 客户编号
                locOwner.getOwner(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -181,6 +189,10 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setStandby1(param.getStandby1().toString());//po
                orderDetl.setBoxType1(locOwner.getId().toString());//货主ID
                orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//货主UUID
                orderDetl.setBoxType3(locOwner.getOwner());//货主
                orderDetl.setPakinPakoutStatus(status);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");

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

@@ -42,6 +42,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private LocOwnerService locOwnerService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -110,6 +112,12 @@
        if (order != null) {
            return R.error("单据编号已存在");
        }
        LocOwner locOwner = null;
        if (!Cools.isEmpty(param.getOwnerId())) {
            locOwner = locOwnerService.selectById(param.getOwnerId());
        } else {
            locOwner = locOwnerService.selectById(1);
        }
        Date now = new Date();
        order = new OrderPakin(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -117,12 +125,12 @@
                DateUtils.convert(now),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getStandby1(),    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                locOwner.getOwnerUuid(),    // 客户编号
                locOwner.getOwner(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -174,6 +182,11 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setStandby1(param.getStandby1().toString());//po
                orderDetl.setBoxType1(locOwner.getId().toString());//货主ID
                orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//货主UUID
                orderDetl.setBoxType3(locOwner.getOwner());//货主
                orderDetl.setPakinPakoutStatus(1);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
                }

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

@@ -42,6 +42,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private LocOwnerService locOwnerService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -110,6 +112,12 @@
        if (order != null) {
            return R.error("单据编号已存在");
        }
        LocOwner locOwner = null;
        if (!Cools.isEmpty(param.getOwnerId())) {
            locOwner = locOwnerService.selectById(param.getOwnerId());
        } else {
            locOwner = locOwnerService.selectById(1);
        }
        Date now = new Date();
        order = new OrderPakout(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -117,12 +125,12 @@
                DateUtils.convert(now),    // 单据日期
                param.getDocType(),    // 单据类型
                null,    // 项目编号
                null,    //
                param.getStandby1(),    //
                null,    // 调拨项目编号
                null,    // 初始票据号
                null,    // 票据号
                null,    // 客户编号
                null,    // 客户
                locOwner.getOwnerUuid(),    // 客户编号
                locOwner.getOwner(),    // 客户
                null,    // 联系方式
                null,    // 操作人员
                null,    // 合计金额
@@ -172,6 +180,11 @@
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                orderDetl.setStandby1(param.getStandby1().toString());//po
                orderDetl.setBoxType1(locOwner.getId().toString());//货主ID
                orderDetl.setBoxType2(locOwner.getOwnerUuid().toString());//货主UUID
                orderDetl.setBoxType3(locOwner.getOwner());//货主
                orderDetl.setPakinPakoutStatus(2);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException("保存订单明细档失败");
                }

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

@@ -168,9 +168,6 @@
    @ApiModelProperty(value= "拥有者 1: 杰克   ")
    private Integer owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

    /**
     * 备用1
     */

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

@@ -23,7 +23,8 @@
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;
    @TableField("owner_uuid")
    private Long ownerUuid;

    @ApiModelProperty(value= "状态")
    private Integer status;
@@ -33,5 +34,4 @@
    private Integer ownerType;

    public LocOwner() {}

}

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

@@ -66,7 +66,7 @@
    @TableField("item_id")
    private Long itemId;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "Po")
    @TableField("item_name")
    private String itemName;


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

@@ -195,12 +195,6 @@
    @TableField("box_type3")
    private String boxType3 = "1";

    @ApiModelProperty(value= "客户名称")
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

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

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

@@ -194,12 +194,6 @@
    @TableField("box_type3")
    private String boxType3 = "1";

    @ApiModelProperty(value= "客户名称")
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

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

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

@@ -309,12 +309,6 @@
    @TableField("box_type3")
    private String boxType3 = "1";

    @ApiModelProperty(value= "客户名称")
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

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

@@ -309,12 +309,6 @@
    @TableField("box_type3")
    private String boxType3 = "1";

    @ApiModelProperty(value= "客户名称")
    private String owner;

    @ApiModelProperty(value= "客户编号")
    private Long uuid;

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

 src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java

@@ -18,6 +18,8 @@
    private Long docType;

    private String orderNo;
    private String standby1;
    private Integer ownerId;

    private List<OrderDetl> orderDetlList;
    private List<OrderDetlPakin> orderDetlPakinList;

 src/main/resources/mapper/LocOwnerMapper.xml

@@ -6,7 +6,7 @@
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocOwner">
        <id column="id" property="id"/>
        <result column="owner" property="owner"/>
        <result column="uuid" property="uuid"/>
        <result column="owner_uuid" property="ownerUuid" />
        <result column="status" property="status"/>
        <result column="owner_type" property="ownerType"/>


 src/main/webapp/static/js/order/order.js

@@ -43,8 +43,9 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'po', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'itemName', align: 'center', title: '客户po',  minWidth: 160, width: 160},
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {field: 'cstmrName', align: 'center', title: '货主',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},
@@ -207,6 +208,8 @@
                            orderId: Number(data.field.id),
                            docType: Number(data.field.docType),
                            orderNo: data.field.orderNo,
                            standby1: data.field.standby1,
                            ownerId: Number(data.field.owner),
                            orderDetlList: nList
                        }),
                        contentType:'application/json;charset=UTF-8',

 src/main/webapp/static/js/orderPakin/order.js

@@ -43,7 +43,9 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'itemName', align: 'center', title: '客户po',  minWidth: 160, width: 160},
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {field: 'cstmrName', align: 'center', title: '货主',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},

 src/main/webapp/static/js/orderPakout/order.js

@@ -43,7 +43,9 @@
        cols: [[
            {type: 'numbers'},
            {field: 'orderNo', title: '单据编号', templet: '#orderNoTpl'},
            {field: 'itemName', align: 'center', title: '客户po',  minWidth: 160, width: 160},
            {field: 'docType$', align: 'center', title: '类型',  minWidth: 160, width: 160},
            {field: 'cstmrName', align: 'center', title: '货主',  minWidth: 160, width: 160},
            {align: 'center', title: '明细', toolbar: '#tbLook', minWidth: 160, width: 160},
            {field: 'createTime$', title: '创建时间', minWidth: 200, width: 200},
            {field: 'settle$', align: 'center', title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160},

 src/main/webapp/views/order/order.html

@@ -164,6 +164,25 @@
<!--                lay-verify="required"-->
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">客户PO：</label>
            <div class="layui-input-block">
                <input id="standby1" name="standby1" placeholder="输入客户PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
                <!--                lay-verify="required"-->
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">货主：</label>
            <div class="layui-input-block cool-auto-complete">
                <input class="layui-input" name="owner" placeholder="输入货主名称" style="display: none">
                <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入货主名称" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                <div class="cool-auto-complete-window">
                    <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                    <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                    </select>
                </div>
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">
            <label class="layui-form-label">单据明细：</label>
            <div class="layui-input-block">