From 2f7c2cf530721226082cb4fb7efe10ddc22070f6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 10:29:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/AgvCommonService.java | 6
src/main/java/com/zy/asrs/entity/OrderDetl.java | 26 ++++
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 10
src/main/java/com/zy/asrs/controller/OpenController.java | 198 ---------------------------------
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 24 ++++
src/main/webapp/static/js/order/order.js | 46 +++++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 1
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 9 +
src/main/resources/application.yml | 4
src/main/webapp/views/order/order.html | 10 +
10 files changed, 123 insertions(+), 211 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 9f38872..030e574 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -425,11 +425,11 @@
if (mT.equals("unAuto")) {
moveType = "2";
ioType = 111;
- int count = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("io_type", ioType));
- if (count>3){
- log.equals("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒锛侊紒褰撳墠闄愬埗鏁伴噺3鏉★紝闄愬埗鏉′欢锛歩o_type = 111");
- throw new CoolException("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒");
- }
+ //int count = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("io_type", ioType));
+ //if (count>3){
+ // log.equals("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒锛侊紒褰撳墠闄愬埗鏁伴噺3鏉★紝闄愬埗鏉′欢锛歩o_type = 111");
+ // throw new CoolException("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒");
+ //}
} else {
moveType = "1";
ioType = 108;
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7b763f5..1e2b75c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -35,106 +35,6 @@
@Autowired
private OpenService openService;
-
-
- /****************************************************************************/
- /********************************* 鎵撳寘涓婄嚎 **********************************/
- /****************************************************************************/
-
-
- @PostMapping("/order/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) PackParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.packageUp(param);
- return R.ok();
- }
-
-
-
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- @PostMapping("/order/pakin/new/default/v1")
- public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakinOrderCreate(param);
- return R.ok();
- }
-
- /**
- * 鍏ュ簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakinOrderComplete(param));
- }
-
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @PostMapping("/order/pakout/new/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getLgort())) {
- return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
- }
- if (!param.getLgort().equals("5006")) {
- return R.ok();
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
- }
-
- /**
- * 鍑哄簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakout/complete/default/v1")
- public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok().add(openService.pakoutOrderComplete(param));
- }
-
-
/**
* 搴撳瓨缁熻
*/
@@ -163,45 +63,7 @@
}
- /**
- * 鍏ュ簱閫氱煡妗ｇ敓鎴�
- */
- @PostMapping("/comb/v1")
- public synchronized R combMES(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.combMes(param);
- return R.ok("缁勬墭鎴愬姛");
- }
- /**
- * 鍏ュ簱璁板綍鑾峰彇
- */
- @PostMapping("/inlog/v1")
- public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
- HttpServletRequest request){
- auth(appkey,null, request);
- if (Cools.isEmpty()) {
- return R.parse(BaseRes.PARAM);
- }
- return R.ok().add(openService.inlogERP());
- }
- /**
- * 鍑哄簱璁板綍鑾峰彇
- */
- @PostMapping("/outlog/v1")
- public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
- HttpServletRequest request){
- auth(appkey,null, request);
- if (Cools.isEmpty()) {
- return R.parse(BaseRes.PARAM);
- }
- return R.ok().add(openService.outlogERP());
- }
private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -218,66 +80,6 @@
}
}
- @PostMapping("/order/matSync/default/v1")
- public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Map<String, Object> param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- int msgU = 0;
- int msgT = 0;
- int msgF = 0;
- StringBuilder msg= new StringBuilder("鍘熷洜锛�");
-
- List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
-
- for (Object matDetail : matDetails){
- MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
- if (Cools.isEmpty(matDetails)) {
- msgF++;
- continue;
- }
- openService.syncMat(matInfoParam);
- if(matInfoParam.isUpdate()){
- msgU++;
- }else if(matInfoParam.isInsert()){
- msgT++;
- } else if(matInfoParam.isError()){
- msgF++;
- msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
- }
- }
- String message = "";
- boolean success = false;
- if(msgT != 0){
- message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�";
- success = true;
- }
- if(msgU != 0){
- message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�";
- success = true;
- }
- if(msgF != 0){
- message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg;
- }
- if(success){
- return R.ok(message);
- }else {
- return R.error(message);
- }
-
-// if (MsgF==0){
-// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
-// }else if (MsgT==0){
-// return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
-// }else {
-// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
-// }
-
- }
@PostMapping("/order/pak/default/v1")
@AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index ae6e8fa..869d7cb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -292,9 +292,16 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 宸ュ簭鐘舵��
+ */
+ @ApiModelProperty(value= "宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐")
+ @TableField("process_sts")
+ private Integer processSts;
+
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) {
+ 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,Integer processSts) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -334,6 +341,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.processSts = processSts;
}
public String getOrderId$(){
@@ -345,6 +353,22 @@
return null;
}
+ public String getProcessSts$(){
+ if (null == this.processSts){ return null; }
+ switch (this.processSts){
+ case 0:
+ return "鍏朵粬";
+ case 1:
+ return "寰呭姞宸�";
+ case 2:
+ return "宸插姞宸�";
+ case 3:
+ return "鏃犻渶鍔犲伐";
+ default:
+ return String.valueOf(this.processSts);
+ }
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 591ab0b..8d9c2ba 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -501,10 +501,16 @@
@Synchronized
public String allocationOut(AgvMobileStartPakin param, Long userId) {
Date now = new Date();
+ if(Cools.isEmpty(param.getBarcode())) {
+ throw new CoolException("璇疯緭鍏ヨ揣鏋剁爜");
+ }
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", param.getDevNo()));
Integer oldWrkNo = agvWrkMast.getWrkNo();
if (Cools.isEmpty(agvWrkMast)) {
throw new CoolException("宸ヤ綔妗ｄ腑娌℃湁姝ょ珯鐐逛换鍔�");
+ }
+ if (!agvWrkMast.getBarcode().equals(param.getBarcode())) {
+ throw new CoolException("褰撳墠璐ф灦鐮佷笌浠诲姟涓嶅尮閰�");
}
if (!agvWrkMast.getWrkSts().equals(207L)) {
throw new CoolException("宸ヤ綔鐘舵�佷笉绗﹀悎绂诲満鏉′欢");
@@ -546,8 +552,14 @@
public String allocationIn(AgvMobileStartPakin param, Long userId) {
Date now = new Date();
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", param.getBarcode()));
+ if (Cools.isEmpty(agvWrkMast)) {
+ throw new CoolException("鏆傛棤褰撳墠璐ф灦鐮佺殑浠诲姟");
+ }
if (agvWrkMast.getIoType() != 111) {
throw new CoolException("闈炴墜鍔ㄨ皟鎷ㄤ换鍔★紝涓嶆敮鎸佹鍔熻兘");
+ }
+ if (!Cools.isEmpty(agvWrkMast.getSourceLocNo())) {
+ throw new CoolException("褰撳墠璐ф灦鐮佷换鏈夋簮搴撲綅锛岃纭");
}
AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(param.getDevNo());
if (Cools.isEmpty(agvWrkMast)) {
@@ -582,10 +594,16 @@
@Synchronized
public String empOut(AgvMobileStartPakin param, Long userId) {
Date now = new Date();
+ if (Cools.isEmpty(param.getBarcode())) {
+ throw new CoolException("璇疯緭鍏ヨ揣鏋剁爜");
+ }
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", param.getDevNo()));
Integer oldWrkNo = agvWrkMast.getWrkNo();
if (Cools.isEmpty(agvWrkMast)) {
throw new CoolException("宸ヤ綔妗ｄ腑娌℃湁姝ょ珯鐐逛换鍔�");
+ }
+ if (!agvWrkMast.getBarcode().equals(param.getBarcode())) {
+ throw new CoolException("褰撳墠璐ф灦鐮佷笌浠诲姟涓嶅尮閰�");
}
agvWrkMast.setWrkSts(213L);
agvWrkMast.setSourceLocNo("");
@@ -608,6 +626,12 @@
if (Cools.isEmpty(agvWrkMast)) {
throw new CoolException("宸ヤ綔妗ｄ腑娌℃湁姝ょ珯鐐逛换鍔�");
}
+ if (agvWrkMast.getIoType() != 113) {
+ throw new CoolException("褰撳墠宸ヤ綔绫诲瀷涓嶈兘绌烘灦杩涘満");
+ }
+ if (agvWrkMast.getWrkSts() != 213) {
+ throw new CoolException("褰撳墠宸ヤ綔绫诲瀷涓嶈兘绌烘灦杩涘満");
+ }
agvWrkMast.setWrkSts(214L);
agvWrkMast.setSourceLocNo(param.getDevNo());
if (!agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no",agvWrkMast.getWrkNo()))) {
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 542545d..b1fdf09 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -355,6 +355,7 @@
//鏌ヨ鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
if(!Cools.isEmpty(agvWaitPakinList)){
+
agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
String devNo = agvBasDevp.getDevNo();
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 1d2ebdc..dc7ce58 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -196,7 +196,14 @@
}
private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
- AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
+ String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
+ AgvBasDevp devpNo = new AgvBasDevp();
+ if ("01".equals(lev1)) {
+ devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
+ } else {
+ devpNo = agvCommonService.getDevpNo(3, 5, "Y", "Y");
+ }
+
if (Cools.isEmpty(devpNo)) {
throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
}
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 8efe2b6..f87765f 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -253,7 +253,11 @@
if (isEmpty) {
wrapper.eq("floor", floor).eq("lev1",1);
} else {
- wrapper.eq("floor", floor).orderBy("lev1",!orderBy);
+ if (isCurrLev) {
+ wrapper.eq("floor", floor).eq("lev1",1);
+ } else {
+ wrapper.eq("floor", floor).orderBy("lev1",!orderBy);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d7f8164..968a193 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- # url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 159fa28..d24c3ab 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -162,7 +162,7 @@
//{field: 'manu', title: '琛屽彿'},
{field: 'threeCode', title: '閿�鍞崟鍙�'},
{field: 'deadTime', title: '鑷敱椤�'},
- //{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
+ {field: 'processSts$', title: '宸ュ簭'}
]],
request: {
pageName: 'curr',
@@ -195,7 +195,7 @@
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
content: $('#editDialog').html(),
- area: '1300px',
+ area: '1600px',
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
@@ -254,6 +254,13 @@
page: true,
height: '350px;',
cellMinWidth: 100,
+
+ css: [ // 璁剧疆鍗曞厓鏍兼牱寮�
+ // 鍙栨秷榛樿鐨勬孩鍑洪殣钘忥紝骞惰缃�傚綋楂樺害
+ '.layui-table-cell{height: 50px; line-height: 40px;}',
+ '.layui-table-cell .layui-colorpicker{width: 38px; height: 38px;}',
+ '.layui-table-cell select{height: 36px; padding: 0 5px;}'
+ ].join(''),
cols: [[
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
@@ -263,13 +270,35 @@
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'threeCode', title: '閿�鍞鍗曞彿(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'deadTime', title: '閿�鍞鍗曡鍙�(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'processSts', title: '宸ュ簭', templet: function (d) {
+ console.log(d)
+ var select = `<select class="layui-select" name="processSts" lay-filter="processStsSelect" data-value=${d.processSts} id=${d.id}>
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭姞宸�</option>
+ <option value="2">宸插姞宸�</option>
+ <option value="3">鏃犻渶鍔犲伐</option>
+ </select>`;
+ return select;
+ }},
// {field: 'inQty', title: '宸插叆搴撻噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
- done: function (res) {
+ done: function (res,curr, count) {
+ console.log(res)
$(layero).find('.layui-table-view').css('margin', '0');
+ $(".layui-table-body").css('overflow','visible');
+ $(".layui-table-box").css('overflow','visible');
+ $(".layui-table-view").css('overflow','visible');
+
+ var tableElem = this.elem.next('.layui-table-view');
+ count || tableElem.find('.layui-table-header').css('overflow', 'auto');
+ layui.each(tableElem.find('select[name="processSts"]'), function (index, item) {
+ var elem = $(item);
+ elem.val(elem.data('state')).parents('div.layui-table-cell').css('overflow', 'visible');
+ });
+ form.render();//鍒锋柊琛ㄥ崟
},
size: ''
};
@@ -314,6 +343,17 @@
});
}
});
+ // 宸ュ叿鏉＄偣鍑讳簨浠�
+ form.on('select(processStsSelect)', function (obj) {
+ console.log(obj)
+ var id = obj.elem.id
+ var val = obj.value
+ for (let item of xxDataList) {
+ if (item.id == id) {
+ item.processSts = val
+ }
+ }
+ });
// 鏄庣粏鏁版嵁淇敼
table.on('edit(formSSXMTable)', function (obj) {
let index = obj.tr.attr("data-index");
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index deb7c67..dc07fa1 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -38,6 +38,11 @@
.btn-delete {
display: none;
}
+ td .layui-form-select {
+ margin-top: -9px;
+ margin-left: -14px;
+ margin-right: -14px;
+ }
</style>
</head>
<body>
@@ -208,6 +213,11 @@
</form>
</script>
+<!--宸ュ簭鐘舵��-->
+<script type="text/html" id="process">
+
+</script>
+
<!-- 璁㈠崟浠诲姟杩芥函 -->
<script id="wrkTraceDialog" type="text/html" style="position: relative">
<div style="position: absolute; top: 0; left: 0;">
--
Gitblit v1.9.1