From 937798fcb19161d9f266c0f661e4fa0858b7fe3d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 十二月 2024 16:12:11 +0800
Subject: [PATCH] #led信息显示订单信息
---
src/main/resources/mapper/OrderMapper.xml | 46
src/main/java/com/zy/asrs/controller/OrderController.java | 125 ++
src/main/java/com/zy/asrs/service/OrderService.java | 8
src/main/java/com/zy/asrs/entity/OrderDetl.java | 538 ++++++++++
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 12
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 42
src/main/java/com/zy/common/web/BaseController.java | 50 +
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 125 ++
src/main/java/com/zy/asrs/entity/Order.java | 426 ++++++++
src/main/webapp/static/js/orderDetl/orderDetl.js | 312 ++++++
src/main/java/com/zy/common/CodeBuilder.java | 6
src/main/webapp/views/order/order.html | 350 +++++++
src/main/java/com/zy/common/model/MatDto.java | 17
src/main/resources/mapper/OrderDetlMapper.xml | 58 +
src/main/java/order.sql | 18
src/main/java/orderDetl.sql | 18
src/main/java/com/zy/asrs/service/OrderDetlService.java | 8
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 12
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 12
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 12
src/main/webapp/static/js/order/order.js | 300 ++++++
src/main/webapp/views/orderDetl/orderDetl.html | 407 ++++++++
22 files changed, 2,885 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
new file mode 100644
index 0000000..90d7391
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class OrderController extends BaseController {
+
+ @Autowired
+ private OrderService orderService;
+
+ @RequestMapping(value = "/order/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(orderService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/order/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(Order.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/order/add/auth")
+ @ManagerAuth
+ public R add(Order order) {
+ orderService.insert(order);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/update/auth")
+ @ManagerAuth
+ public R update(Order order){
+ if (Cools.isEmpty(order) || null==order.getId()){
+ return R.error();
+ }
+ orderService.updateById(order);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ orderService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
+ convert(map, wrapper);
+ List<Order> list = orderService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/orderQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (Order order : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", order.getId());
+ map.put("value", order.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/order/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != orderService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
new file mode 100644
index 0000000..42376a2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -0,0 +1,125 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class OrderDetlController extends BaseController {
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+ @RequestMapping(value = "/orderDetl/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(orderDetlService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/orderDetl/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(OrderDetl.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/orderDetl/add/auth")
+ @ManagerAuth
+ public R add(OrderDetl orderDetl) {
+ orderDetlService.insert(orderDetl);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetl orderDetl){
+ if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ return R.error();
+ }
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/orderDetl/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ orderDetlService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/orderDetl/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
+ convert(map, wrapper);
+ List<OrderDetl> list = orderDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/orderDetlQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (OrderDetl orderDetl : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", orderDetl.getId());
+ map.put("value", orderDetl.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/orderDetl/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != orderDetlService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
new file mode 100644
index 0000000..ba8cfd0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -0,0 +1,426 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_order")
+public class Order implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @TableField("order_time")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @TableField("doc_type")
+ private Long docType;
+
+ /**
+ * 椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @TableField("item_id")
+ private Long itemId;
+
+ @ApiModelProperty(value= "")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
+ * 璋冩嫧椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
+ private Long allotItemId;
+
+ /**
+ * 鍒濆绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
+ private String defNumber;
+
+ /**
+ * 绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ private String number;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ private Long cstmr;
+
+ /**
+ * 瀹㈡埛
+ */
+ @ApiModelProperty(value= "瀹㈡埛")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ private String tel;
+
+ /**
+ * 鎿嶄綔浜哄憳
+ */
+ @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
+ private String operMemb;
+
+ /**
+ * 鍚堣閲戦
+ */
+ @ApiModelProperty(value= "鍚堣閲戦")
+ @TableField("total_fee")
+ private Double totalFee;
+
+ /**
+ * 浼樻儬鐜�
+ */
+ @ApiModelProperty(value= "浼樻儬鐜�")
+ private Double discount;
+
+ /**
+ * 浼樻儬閲戦
+ */
+ @ApiModelProperty(value= "浼樻儬閲戦")
+ @TableField("discount_fee")
+ private Double discountFee;
+
+ /**
+ * 閿�鍞垨閲囪喘璐圭敤鍚堣
+ */
+ @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
+ private Double otherFee;
+
+ /**
+ * 瀹炰粯閲戦
+ */
+ @ApiModelProperty(value= "瀹炰粯閲戦")
+ @TableField("act_fee")
+ private Double actFee;
+
+ /**
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ */
+ @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value= "涓氬姟鍛�")
+ private String salesman;
+
+ /**
+ * 缁撶畻澶╂暟
+ */
+ @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @TableField("account_day")
+ private Integer accountDay;
+
+ /**
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ */
+ @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
+ private Integer postFeeType;
+
+ /**
+ * 閭垂
+ */
+ @ApiModelProperty(value= "閭垂")
+ @TableField("post_fee")
+ private Double postFee;
+
+ /**
+ * 浠樻鏃堕棿
+ */
+ @ApiModelProperty(value= "浠樻鏃堕棿")
+ @TableField("pay_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 鍙戣揣鏃堕棿
+ */
+ @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 鐗╂祦鍚嶇О
+ */
+ @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
+ private String shipName;
+
+ /**
+ * 鐗╂祦鍗曞彿
+ */
+ @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ private Long settle;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @ApiModelProperty(value= "")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ public Order() {}
+
+ public Order(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,Integer moveStatus) {
+ 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;
+ this.moveStatus = moveStatus;
+ }
+
+// Order order = new Order(
+// null, // 缂栧彿[闈炵┖]
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 椤圭洰缂栧彿
+// null, //
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// null, // 瀹㈡埛缂栧彿
+// null, // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// null, // 璁㈠崟鐘舵��
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null //
+// );
+
+
+
+ public String getPayType$(){
+ if (null == this.payType){ return null; }
+ switch (this.payType){
+ case 1:
+ return "鐜伴噾";
+ case 2:
+ return "璁拌处";
+ default:
+ return String.valueOf(this.payType);
+ }
+ }
+
+ public String getPostFeeType$(){
+ if (null == this.postFeeType){ return null; }
+ switch (this.postFeeType){
+ case 1:
+ return "鍦ㄧ嚎鏀粯";
+ case 2:
+ return "璐у埌浠樻";
+ default:
+ return String.valueOf(this.postFeeType);
+ }
+ }
+
+ public String getPayTime$(){
+ if (Cools.isEmpty(this.payTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
+ }
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
new file mode 100644
index 0000000..b85fa66
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -0,0 +1,538 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.Order;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_order_detl")
+public class OrderDetl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁㈠崟鍐呯爜
+ */
+ @ApiModelProperty(value= "璁㈠崟鍐呯爜")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ @ApiModelProperty(value= "")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧缂栫爜
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value= "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ @ApiModelProperty(value= "")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 鏉″舰鐮�
+ */
+ @ApiModelProperty(value= "鏉″舰鐮�")
+ @TableField("qr_code")
+ private String qrCode;
+
+ /**
+ * 鏀跺嵎寮�濮嬫棩鏈�
+ */
+ @ApiModelProperty(value= "鏀跺嵎寮�濮嬫棩鏈�")
+ @TableField("start_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startDate;
+
+ /**
+ * 鏀跺嵎缁撴潫鏃ユ湡
+ */
+ @ApiModelProperty(value= "鏀跺嵎缁撴潫鏃ユ湡")
+ @TableField("end_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endDate;
+
+ /**
+ * 棰勭暀1
+ */
+ @ApiModelProperty(value= "棰勭暀1")
+ private String temp1;
+
+ @ApiModelProperty(value= "")
+ private String temp2;
+
+ @ApiModelProperty(value= "")
+ private String temp3;
+
+ @ApiModelProperty(value= "")
+ private String temp4;
+
+ public OrderDetl() {}
+
+ public OrderDetl(Long orderId,String orderNo,Double anfme,Double qty,String matnr,String maktx,String batch,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Double workQty,String qrCode,Date startDate,Date endDate,String temp1,String temp2,String temp3,String temp4) {
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.qty = qty;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.safeQty = safeQty;
+ this.weight = weight;
+ this.length = length;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.workQty = workQty;
+ this.qrCode = qrCode;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ this.temp4 = temp4;
+ }
+
+// OrderDetl orderDetl = new OrderDetl(
+// null, // 璁㈠崟鍐呯爜
+// null, // 鍗曟嵁缂栧彿
+// null, // 鏁伴噺
+// null, //
+// null, // 鍟嗗搧缂栫爜
+// null, // 鍟嗗搧鍚嶇О
+// null, // 鎵瑰彿
+// null, // 瑙勬牸
+// null, // 鍨嬪彿
+// null, // 棰滆壊
+// null, // 鍝佺墝
+// null, // 鍗曚綅
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍗曚綅閲�
+// null, // 鏉＄爜
+// null, // 浜у湴
+// null, // 鍘傚
+// null, // 鐢熶骇鏃ユ湡
+// null, // 鍝侀」鏁�
+// null, // 瀹夊叏搴撳瓨閲�
+// null, // 閲嶉噺
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null, // 鏄惁鎵规
+// null, // 淇濊川鏈�
+// null, // 棰勮澶╂暟
+// null, // 鍒惰喘
+// null, // 瑕佹眰妫�楠�
+// null, // 鍗遍櫓鍝�
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null, //
+// null, // 鏉″舰鐮�
+// null, // 鏀跺嵎寮�濮嬫棩鏈�
+// null, // 鏀跺嵎缁撴潫鏃ユ湡
+// null, // 棰勭暀1
+// null, //
+// null, //
+// null //
+// );
+
+ public String getOrderId$(){
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.selectById(this.orderId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getId());
+ }
+ return null;
+ }
+
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getStartDate$(){
+ if (Cools.isEmpty(this.startDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startDate);
+ }
+
+ public String getEndDate$(){
+ if (Cools.isEmpty(this.endDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endDate);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
new file mode 100644
index 0000000..37933ff
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.OrderDetl;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
new file mode 100644
index 0000000..21bfca7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.Order;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderMapper extends BaseMapper<Order> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
new file mode 100644
index 0000000..e169f39
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.OrderDetl;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface OrderDetlService extends IService<OrderDetl> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
new file mode 100644
index 0000000..c895c8e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.Order;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface OrderService extends IService<Order> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 21950de..3d10f0a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -91,15 +91,11 @@
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
- private WrkMastStaMapper wrkMastStaMapper;
- @Autowired
- private BasRgvService basRgvService;
- @Autowired
- private BasRgvMapMapper basRgvMapMapper;
- @Autowired
private WrkMastService wrkMastService;
@Autowired
- private BasRgvMapService basRgvMapService;
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Value("${wms.url}")
private String wmsUrl;
@@ -1591,15 +1587,31 @@
} else {
total = locDetl.getAnfme();
}
- if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", wrkDetl.getOrderNo())
+ .eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total,orderDetl.getSuppCode(),orderDetl.getSku()));
+ }
+ }else {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
+ if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
+ if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
+ ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
+ }
}
- if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
- }
- if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
- ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
- }
+
+
});
}
commands.add(ledCommand);
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
new file mode 100644
index 0000000..414b701
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("orderDetlService")
+public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
new file mode 100644
index 0000000..8b3c975
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.OrderMapper;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.OrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("orderService")
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index d2c576a..0f00c78 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -1,6 +1,7 @@
package com.zy.common;
import com.core.generators.CoolGenerator;
+import com.core.generators.constant.SqlOsType;
/**
* Created by vincent on 2019-06-04
@@ -15,10 +16,11 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="192.168.3.208:1433;databasename=cool";
+ generator.sqlOsType = SqlOsType.SQL_SERVER;
+ generator.url="127.0.0.1:1433;databasename=jxgtasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_detl";
+ generator.table="man_order_detl";
generator.packagePath="com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 99a2f28..af31f5e 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -29,6 +29,10 @@
private Double total;
+ private String orderNo;
+
+ private String customer;
+
public MatDto() {
}
public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
@@ -42,6 +46,19 @@
this.total = total;
}
+ public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total,String orderNo,String customer) {
+ this.matnr = matnr;
+ this.maknx = maknx;
+ this.batch = batch;
+ this.specs = specs;
+ this.manu = manu;
+ this.memo = memo;
+ this.count = count;
+ this.total = total;
+ this.orderNo = orderNo;
+ this.customer = customer;
+ }
+
public MatDto(String matNo, String maknx, Double count) {
this.matnr = matNo;
this.maknx = maknx;
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 80596c9..566fb9a 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,5 +1,7 @@
package com.zy.common.web;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.controller.AbstractBaseController;
@@ -11,11 +13,17 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
/**
* Created by vincent on 2019-09-09
*/
public class BaseController extends AbstractBaseController {
+
+ protected static final String RANGE_TIME_LINK = " - ";
@Autowired
protected HttpServletRequest request;
@@ -43,4 +51,46 @@
}
return "";
}
+
+
+ /**
+ * 鍏ㄥ瓧娈垫ā绯婃悳绱�
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
+ * @param condition 鎼滅储鍐呭
+ */
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ if (Cools.isEmpty(condition)) {
+ return;
+ }
+ List<String> columns = new ArrayList<>();
+ for (Field field :Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!set.contains(column)) {
+ columns.add(column);
+ }
+ }
+ if (columns.isEmpty()) {
+ return;
+ }
+ for (int i=0;i<columns.size();i++){
+ if (i==0){
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.like(columns.get(i), condition);
+ }
+ }
}
diff --git a/src/main/java/order.sql b/src/main/java/order.sql
new file mode 100644
index 0000000..a510361
--- /dev/null
+++ b/src/main/java/order.sql
@@ -0,0 +1,18 @@
+-- save order record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order/order.html', 'order绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'order#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order/order.html', N'order绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'order#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/orderDetl.sql b/src/main/java/orderDetl.sql
new file mode 100644
index 0000000..db54a6d
--- /dev/null
+++ b/src/main/java/orderDetl.sql
@@ -0,0 +1,18 @@
+-- save orderDetl record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl/orderDetl.html', 'orderDetl绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'orderDetl#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl/orderDetl.html', N'orderDetl绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'orderDetl#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
new file mode 100644
index 0000000..86d0bbc
--- /dev/null
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.OrderDetlMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.OrderDetl">
+ <id column="id" property="id" />
+ <result column="order_id" property="orderId" />
+ <result column="order_no" property="orderNo" />
+ <result column="anfme" property="anfme" />
+ <result column="qty" property="qty" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
+ <result column="batch" property="batch" />
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
+ <result column="color" property="color" />
+ <result column="brand" property="brand" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="work_qty" property="workQty" />
+ <result column="qr_code" property="qrCode" />
+ <result column="start_date" property="startDate" />
+ <result column="end_date" property="endDate" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="temp4" property="temp4" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
new file mode 100644
index 0000000..616a2b4
--- /dev/null
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.OrderMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Order">
+ <id column="id" property="id" />
+ <result column="uuid" property="uuid" />
+ <result column="order_no" property="orderNo" />
+ <result column="order_time" property="orderTime" />
+ <result column="doc_type" property="docType" />
+ <result column="item_id" property="itemId" />
+ <result column="item_name" property="itemName" />
+ <result column="allot_item_id" property="allotItemId" />
+ <result column="def_number" property="defNumber" />
+ <result column="number" property="number" />
+ <result column="cstmr" property="cstmr" />
+ <result column="cstmr_name" property="cstmrName" />
+ <result column="tel" property="tel" />
+ <result column="oper_memb" property="operMemb" />
+ <result column="total_fee" property="totalFee" />
+ <result column="discount" property="discount" />
+ <result column="discount_fee" property="discountFee" />
+ <result column="other_fee" property="otherFee" />
+ <result column="act_fee" property="actFee" />
+ <result column="pay_type" property="payType" />
+ <result column="salesman" property="salesman" />
+ <result column="account_day" property="accountDay" />
+ <result column="post_fee_type" property="postFeeType" />
+ <result column="post_fee" property="postFee" />
+ <result column="pay_time" property="payTime" />
+ <result column="send_time" property="sendTime" />
+ <result column="ship_name" property="shipName" />
+ <result column="ship_code" property="shipCode" />
+ <result column="settle" property="settle" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="move_status" property="moveStatus" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
new file mode 100644
index 0000000..e8c9fa9
--- /dev/null
+++ b/src/main/webapp/static/js/order/order.js
@@ -0,0 +1,300 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#order',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/order/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'uuid', align: 'center',title: '缂栧彿'}
+ ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
+ ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
+ ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
+ ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
+ ,{field: 'itemName', align: 'center',title: ''}
+ ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿'}
+ ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�'}
+ ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
+ ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
+ ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
+ ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
+ ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
+ ,{field: 'discount', align: 'center',title: '浼樻儬鐜�'}
+ ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦'}
+ ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣'}
+ ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦'}
+ ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
+ ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�'}
+ ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟'}
+ ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷'}
+ ,{field: 'postFee', align: 'center',title: '閭垂'}
+ ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿'}
+ ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿'}
+ ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О'}
+ ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿'}
+ ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'moveStatus', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(order)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(order)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'order': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/order/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(order)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#payTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['payTime\\$']:null
+ });
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['sendTime\\$']:null
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
new file mode 100644
index 0000000..a6e4bcb
--- /dev/null
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -0,0 +1,312 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#orderDetl',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/orderDetl/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: ''}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'price', align: 'center',title: '鍗曚环'}
+ ,{field: 'sku', align: 'center',title: 'sku'}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'origin', align: 'center',title: '浜у湴'}
+ ,{field: 'manu', align: 'center',title: '鍘傚'}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡'}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�'}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺'}
+ ,{field: 'length', align: 'center',title: '闀垮害'}
+ ,{field: 'volume', align: 'center',title: '浣撶Н'}
+ ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�'}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘'}
+ ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
+ ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'workQty', align: 'center',title: ''}
+ ,{field: 'qrCode', align: 'center',title: '鏉″舰鐮�'}
+ ,{field: 'startDate$', align: 'center',title: '鏀跺嵎寮�濮嬫棩鏈�'}
+ ,{field: 'endDate$', align: 'center',title: '鏀跺嵎缁撴潫鏃ユ湡'}
+ ,{field: 'temp1', align: 'center',title: '棰勭暀1'}
+ ,{field: 'temp2', align: 'center',title: ''}
+ ,{field: 'temp3', align: 'center',title: ''}
+ ,{field: 'temp4', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(orderDetl)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(orderDetl)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'orderDetl': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/orderDetl/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(orderDetl)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/orderDetl/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/orderDetl/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+ layDate.render({
+ elem: '#startDate\\$',
+ type: 'datetime',
+ value: data!==undefined?data['startDate\\$']:null
+ });
+ layDate.render({
+ elem: '#endDate\\$',
+ type: 'datetime',
+ value: data!==undefined?data['endDate\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
new file mode 100644
index 0000000..7d52647
--- /dev/null
+++ b/src/main/webapp/views/order/order.html
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="order" lay-filter="order"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ョ紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁㈠崟缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderTime" placeholder="璇疯緭鍏ュ崟鎹棩鏈�">
+ </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="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
+ <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </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="itemId" placeholder="璇疯緭鍏ラ」鐩紪鍙�" style="display: none">
+ <input id="itemId$" name="itemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="itemQueryByitemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="itemQueryByitemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="itemName" placeholder="璇疯緭鍏�">
+ </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="allotItemId" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" style="display: none">
+ <input id="allotItemId$" name="allotItemId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ皟鎷ㄩ」鐩紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="itemQueryByallotItemId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="itemQueryByallotItemIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒濆绁ㄦ嵁鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="defNumber" placeholder="璇疯緭鍏ュ垵濮嬬エ鎹彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绁ㄦ嵁鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="number" placeholder="璇疯緭鍏ョエ鎹彿">
+ </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="cstmr" placeholder="璇疯緭鍏ュ鎴风紪鍙�" style="display: none">
+ <input id="cstmr$" name="cstmr$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ鎴风紪鍙�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="cstmrQueryBycstmr" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="cstmrQueryBycstmrSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="cstmrName" placeholder="璇疯緭鍏ュ鎴�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎿嶄綔浜哄憳: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="operMemb" placeholder="璇疯緭鍏ユ搷浣滀汉鍛�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚堣閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="totalFee" placeholder="璇疯緭鍏ュ悎璁￠噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼樻儬鐜�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="discount" placeholder="璇疯緭鍏ヤ紭鎯犵巼">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浼樻儬閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="discountFee" placeholder="璇疯緭鍏ヤ紭鎯犻噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閿�鍞垨閲囪喘璐圭敤鍚堣: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="otherFee" placeholder="璇疯緭鍏ラ攢鍞垨閲囪喘璐圭敤鍚堣">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹炰粯閲戦: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="actFee" placeholder="璇疯緭鍏ュ疄浠橀噾棰�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠樻绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="payType">
+ <option value="">璇烽�夋嫨浠樻绫诲瀷</option>
+ <option value="1">鐜伴噾</option>
+ <option value="2">璁拌处</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓氬姟鍛�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="salesman" placeholder="璇疯緭鍏ヤ笟鍔″憳">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撶畻澶╂暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="accountDay" placeholder="璇疯緭鍏ョ粨绠楀ぉ鏁�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閭垂鏀粯绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="postFeeType">
+ <option value="">璇烽�夋嫨閭垂鏀粯绫诲瀷</option>
+ <option value="1">鍦ㄧ嚎鏀粯</option>
+ <option value="2">璐у埌浠樻</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閭垂: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="postFee" placeholder="璇疯緭鍏ラ偖璐�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠樻鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="payTime" id="payTime$" placeholder="璇疯緭鍏ヤ粯娆炬椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍙戣揣鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ュ彂璐ф椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂祦鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="shipName" placeholder="璇疯緭鍏ョ墿娴佸悕绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐗╂祦鍗曞彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="shipCode" placeholder="璇疯緭鍏ョ墿娴佸崟鍙�">
+ </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="settle" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" style="display: none">
+ <input id="settle$" name="settle$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="orderSettleQueryBysettle" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="orderSettleQueryBysettleSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
+ <input id="createBy$" name="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </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="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" name="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="moveStatus" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
new file mode 100644
index 0000000..218c02e
--- /dev/null
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -0,0 +1,407 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="orderDetl" lay-filter="orderDetl"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/orderDetl/orderDetl.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璁㈠崟鍐呯爜: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="orderId" placeholder="璇疯緭鍏ヨ鍗曞唴鐮�" style="display: none">
+ <input id="orderId$" name="orderId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ鍗曞唴鐮�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="orderQueryByorderId" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="orderQueryByorderIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="anfme" placeholder="璇疯緭鍏ユ暟閲�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="qty" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍟嗗搧缂栫爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍟嗗搧鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵瑰彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍨嬪彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰滆壊: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="color" placeholder="璇疯緭鍏ラ鑹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍝佺墝: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="brand" placeholder="璇疯緭鍏ュ搧鐗�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚綅: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="unit" placeholder="璇疯緭鍏ュ崟浣�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚环: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="price" placeholder="璇疯緭鍏ュ崟浠�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">sku: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sku" placeholder="璇疯緭鍏ku">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曚綅閲�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="units" placeholder="璇疯緭鍏ュ崟浣嶉噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏉＄爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浜у湴: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="origin" placeholder="璇疯緭鍏ヤ骇鍦�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘傚: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="manu" placeholder="璇疯緭鍏ュ巶瀹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢熶骇鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="manuDate" placeholder="璇疯緭鍏ョ敓浜ф棩鏈�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍝侀」鏁�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="itemNum" placeholder="璇疯緭鍏ュ搧椤规暟">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹夊叏搴撳瓨閲�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="safeQty" placeholder="璇疯緭鍏ュ畨鍏ㄥ簱瀛橀噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲嶉噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="weight" placeholder="璇疯緭鍏ラ噸閲�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">闀垮害: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="length" placeholder="璇疯緭鍏ラ暱搴�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">浣撶Н: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="volume" placeholder="璇疯緭鍏ヤ綋绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓夋柟缂栫爜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="threeCode" placeholder="璇疯緭鍏ヤ笁鏂圭紪鐮�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">渚涘簲鍟�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="supp" placeholder="璇疯緭鍏ヤ緵搴斿晢">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">渚涘簲鍟嗙紪鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="suppCode" placeholder="璇疯緭鍏ヤ緵搴斿晢缂栫爜">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏄惁鎵规: </label>
+ <div class="layui-input-block">
+ <select name="beBatch">
+ <option value="">璇烽�夋嫨鏄惁鎵规</option>
+ <option value="1">鏄�</option>
+ <option value="0">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇濊川鏈�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="deadTime" placeholder="璇疯緭鍏ヤ繚璐ㄦ湡">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰勮澶╂暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="deadWarn" placeholder="璇疯緭鍏ラ璀﹀ぉ鏁�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒惰喘: </label>
+ <div class="layui-input-block">
+ <select name="source">
+ <option value="">璇烽�夋嫨鍒惰喘</option>
+ <option value="1">鍒堕��</option>
+ <option value="2">閲囪喘</option>
+ <option value="3">澶栧崗</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑕佹眰妫�楠�: </label>
+ <div class="layui-input-block">
+ <select name="inspect">
+ <option value="">璇烽�夋嫨瑕佹眰妫�楠�</option>
+ <option value="1">鏄�</option>
+ <option value="0">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗遍櫓鍝�: </label>
+ <div class="layui-input-block">
+ <select name="danger">
+ <option value="">璇烽�夋嫨鍗遍櫓鍝�</option>
+ <option value="1">鏄�</option>
+ <option value="0">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </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="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
+ <input id="createBy$" name="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </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="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
+ <input id="updateBy$" name="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="workQty" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏉″舰鐮�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="qrCode" placeholder="璇疯緭鍏ユ潯褰㈢爜">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏀跺嵎寮�濮嬫棩鏈�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="startDate" id="startDate$" placeholder="璇疯緭鍏ユ敹鍗峰紑濮嬫棩鏈�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏀跺嵎缁撴潫鏃ユ湡: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="endDate" id="endDate$" placeholder="璇疯緭鍏ユ敹鍗风粨鏉熸棩鏈�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">棰勭暀1: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="temp1" placeholder="璇疯緭鍏ラ鐣�1">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="temp2" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="temp3" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="temp4" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1