From a1dd6ff24f7cae0b529ad313ba07351c07965605 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 13:04:09 +0800
Subject: [PATCH] 管控线边仓库存
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 12 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 78 +++++++++++++++
src/main/webapp/static/js/saasLog/saasLog.js | 14 ++
src/main/java/com/zy/asrs/controller/MobileController.java | 12 +-
src/main/webapp/static/js/ioWorks/stockIn.js | 27 +++--
src/main/java/com/zy/asrs/entity/param/MatnrDto.java | 2
src/main/java/com/zy/system/entity/SaasLog.java | 40 +++++--
src/main/webapp/views/saasLog/saasLog.html | 25 ++++
src/main/webapp/static/js/order/order.js | 9 +
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4
src/main/java/com/zy/common/model/DetlDto.java | 15 +++
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 32 +++--
13 files changed, 214 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e1c309e..3dd3986 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -58,7 +58,7 @@
private WrkDetlLogService wrkDetlLogService;
@PostMapping("/pda/OutOrder")
- @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�")
+ @ManagerAuth(memo = "鑾峰緱鍑哄簱鍗�",value = ManagerAuth.Auth.NONE)
@Transactional
public R OutOrder(@RequestParam String orderNo) {
List<Order> orders=new ArrayList<Order>();
@@ -90,7 +90,7 @@
}
@PostMapping("/pda/OutLocNo")
- @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿")
+ @ManagerAuth(memo = "鑾峰緱骞冲簱鍑哄簱鐨勫搴斿簱浣嶅彿",value = ManagerAuth.Auth.NONE)
@Transactional
public R OutLocNo(@RequestParam Long orderId) {
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
@@ -114,10 +114,10 @@
} else {
for (ManLocDetl l : locDetls
) {
- String s = l.getLocNo().substring(0, 2);
- if (Integer.parseInt(s) > 8) {
+// String s = l.getLocNo().substring(0, 2);
+// if (Integer.parseInt(s) > 8) {
list.add(l.getLocNo());
- }
+// }
}
}
}
@@ -127,7 +127,7 @@
}
@PostMapping("/pda/OrderDetlContrastLocDetl")
- @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�")
+ @ManagerAuth(memo = "鑾峰緱璁㈠崟鏄庣粏瀵瑰簲鐨勫簱瀛樻槑缁�",value = ManagerAuth.Auth.NONE)
@Transactional
public R OrderDetlContrastLocDetl(@RequestParam Long orderId, @RequestParam String locNo) {
List<ManLocDetl> locDetlList = new ArrayList<ManLocDetl>();
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e612599..17b1f8e 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -204,13 +204,13 @@
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "璋冩嫧婧愬簱浣�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value= "璋冩嫧鐩爣搴撲綅")
@TableField("supp_code")
private String suppCode;
@@ -377,10 +377,12 @@
public String getInspect$(){
if (null == this.inspect){ return null; }
switch (this.inspect){
- case 1:
- return "鏄�";
case 0:
- return "鍚�";
+ return "鏈笂鎶�";
+ case 1:
+ return "宸蹭笂鎶�";
+ case 2:
+ return "寰呬笂鎶�";
default:
return String.valueOf(this.inspect);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/MatnrDto.java b/src/main/java/com/zy/asrs/entity/param/MatnrDto.java
index f0a716d..94574b6 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatnrDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatnrDto.java
@@ -12,4 +12,6 @@
private Double count;
+ private String barcode;
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 71e8bfb..2a055e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -152,7 +152,7 @@
manLocDetlMapper.updateAnfme(subtract.doubleValue(), combParam.getLocno(), combMat.getMatnr(), combMat.getBatch());
}
// 璁板綍鏃ュ織
- SaasUtils.insertLog(1, combParam.getLocno(), combMat.getMatnr(), combMat.getAnfme(), userId,combMat.getBatch());
+ SaasUtils.insertLog(Cools.isEmpty(combParam.getOrderNo()) ? 1 : 4, combParam.getLocno(), combMat.getMatnr(), combMat.getAnfme(), userId,combMat.getBatch());
} catch (Exception e) {
throw new CoolException("鏇存柊搴撳瓨鏁版嵁鍑洪敊" + e.getMessage());
}
@@ -185,7 +185,7 @@
throw new CoolException(locNo + ":搴撲綅涓嶅瓨鍦�");
}
if (!Cools.isEmpty(locDetl1)) {
- locDetl1.setAnfme(waitPakin.getAnfme() + waitPakin.getAnfme());
+ locDetl1.setAnfme(locDetl1.getAnfme() + waitPakin.getAnfme());
locDetl1.setUpdateBy(userId);
locDetl1.setModiTime(now);
manLocDetlService.update(locDetl1, new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", waitPakin.getMatnr()).
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index da3a9af..a8eee4d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -95,10 +95,10 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ null, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null, // 淇敼鏃堕棿
null // 澶囨敞
);
@@ -110,7 +110,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(), detail.getStaLoc(),detail.getSku());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -133,10 +133,12 @@
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
- orderDetl.setCreateBy(9527L);
+ orderDetl.setSupp(detlDto.getSourceLoc());
+ orderDetl.setSuppCode(detlDto.getStaLoc());
+// orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
@@ -255,10 +257,10 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ null, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null, // 淇敼鏃堕棿
null // 澶囨敞
);
if (!orderService.insert(order)) {
@@ -268,7 +270,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getSourceLoc(),detail.getStaLoc(),detail.getSku());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -289,10 +291,12 @@
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSku(detlDto.getSku()); // 鍗曡鍙凤紝u8鏄庣粏id,涓婃姤闇�瑕�
- orderDetl.setCreateBy(9527L);
+ orderDetl.setSupp(detlDto.getSourceLoc());
+ orderDetl.setSuppCode(detlDto.getStaLoc());
+// orderDetl.setCreateBy(9527L);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index acb5fa9..b8b09db 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,18 +2,22 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.SaasUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2020/7/4
@@ -35,6 +39,15 @@
private WaitPakinService waitPakinService;
@Autowired
private OrderDetlService orderDetlService;
+
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private ManLocDetlService manLocDetlService;
+
+ @Resource
+ private NodeService nodeService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -127,6 +140,28 @@
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+ } else {
+ // 鎻掑叆璋冩嫧鍏ュ簱鍗曞搴旂嚎杈逛粨鍑哄簱璁板綍
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if (order.getDocType$().equals("璋冩嫧鍏ュ簱鍗�")) {
+ String locNo = orderDetl.getSupp();
+ ManLocDetl locDetl2 = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ if (locDetl2 == null) { // 绾胯竟搴撴棤姝ゅ簱瀛�
+ log.warn("璋冩嫧鍏ュ簱鍗曞搴旂嚎杈瑰簱搴撳瓨鏃狅細{locNo:{},matnr:{},batch:{}}", locNo, wrkDetl.getMatnr(), wrkDetl.getBatch());
+ } else if (locDetl2.getAnfme() < wrkDetl.getAnfme()) { // 绾胯竟搴撴搴撳瓨涓嶅
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ log.warn("璋冩嫧鍏ュ簱鍗曞搴旂嚎杈瑰簱搴撳瓨涓嶈冻锛歿locNo:{},matnr:{},batch:{},locAnfme:{},wrkAnfme:{}}", locNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), locDetl2.getAnfme(), wrkDetl.getAnfme());
+ } else if (Objects.equals(locDetl2.getAnfme(), wrkDetl.getAnfme())) { // 鍒犻櫎璇ョ墿鏂欑嚎杈瑰簱搴撳瓨鏁版嵁
+ manLocDetlService.delete(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ } else { // 鏇存柊璇ョ墿鏂欑嚎杈瑰簱搴撳瓨
+ locDetl2.setAnfme(locDetl2.getAnfme() - wrkDetl.getAnfme());
+ locDetl2.setUpdateBy(wrkDetl.getAppeUser());
+ locDetl2.setModiTime(new Date());
+ manLocDetlService.update(locDetl2, new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).eq("batch", wrkDetl.getBatch()));
+ }
+ // 璁板綍鏃ュ織
+ SaasUtils.insertLog(3, locNo, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getAppeUser(), wrkDetl.getBatch());
+ }
}
}
} catch (Exception ignore){}
@@ -361,6 +396,49 @@
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+ } else { // 鎻掑叆璋冩嫧鍑哄簱鍗曞搴旂嚎杈逛粨鍏ュ簱璁板綍
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if(order.getDocType$().equals("璋冩嫧鍑哄簱鍗�")) {
+
+ String locNo = orderDetl.getSuppCode(); // 绾胯竟浠�
+
+ Node node = nodeService.selectByUuid(locNo);
+ if (Cools.isEmpty(node)) {
+ throw new CoolException(locNo + ":搴撲綅涓嶅瓨鍦�");
+ }
+ ManLocDetl locDetl1 = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).
+ eq("batch", wrkDetl.getBatch()));
+ if (!Cools.isEmpty(locDetl1)) {
+ locDetl1.setAnfme(locDetl1.getAnfme() + wrkDetl.getAnfme());
+ locDetl1.setModiTime(now);
+ manLocDetlService.update(locDetl1, new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr", wrkDetl.getMatnr()).
+ eq("batch", wrkDetl.getBatch()));
+ } else {
+ ManLocDetl manLocDetl = new ManLocDetl();
+ manLocDetl.setLocNo(locNo);
+// manLocDetl.setBarcode(barcode);
+// manLocDetl.setZpallet(barcode);
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setMaktx(wrkDetl.getMaktx());
+ manLocDetl.setMatnr(wrkDetl.getMatnr());
+ manLocDetl.setSpecs(wrkDetl.getSpecs());
+ manLocDetl.setBatch(Cools.isEmpty(wrkDetl.getBatch()) ? "" : wrkDetl.getBatch());
+ manLocDetl.setAnfme(wrkDetl.getAnfme());
+ manLocDetl.setCreateBy(wrkDetl.getAppeUser());
+ manLocDetl.setCreateTime(now);
+ if (!manLocDetlService.insert(manLocDetl)) {
+ log.error("搴撳瓨鏇存柊鏃舵彃鍏ョ嚎杈瑰簱鏄庣粏澶辫触");
+ throw new CoolException("搴撳瓨鏇存柊鏃舵彃鍏ョ嚎杈瑰簱鏄庣粏澶辫触锛�");
+ }
+
+ node.setUpdateBy(wrkDetl.getAppeUser());
+ node.setUpdateTime(now);
+ nodeService.updateById(node);
+ }
+
+ // 璁板綍鏃ュ織
+ SaasUtils.insertLog(2, locNo, wrkDetl.getMatnr(), wrkDetl.getAnfme(), wrkDetl.getAppeUser(),wrkDetl.getBatch());
+ }
}
}
} catch (Exception ignore){}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index da3b481..27f2a7a 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,12 @@
private Double anfme;
+ // 璋冩嫧婧愬簱浣�
+ private String sourceLoc;
+
+ // 璋冩嫧鐩爣搴撲綅
+ private String staLoc;
+
/**
* 鍗曡鍙凤紝u8鏄庣粏id
*/
@@ -45,6 +51,15 @@
this.anfme = anfme;
}
+ public DetlDto(String matnr, String batch, Double anfme,String sourceLoc,String staLoc,String sku) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.sourceLoc = sourceLoc;
+ this.staLoc = staLoc;
+ this.sku = sku;
+ }
+
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
this.orderNo = orderNo;
this.matnr = matnr;
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index 2069e4e..7e8fccc 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,7 +29,7 @@
private Long id;
/**
- * {0:鍏ュ簱,1:鍑哄簱}
+ * {0:鍏ュ簱,1:鍑哄簱,2.璋冩嫧鍏ワ紝3.璋冩嫧鍑猴紝4.棰嗘枡鍑簘
*/
@ApiModelProperty(value= "{0:鍏ュ簱,1:鍑哄簱}")
private Integer type;
@@ -81,19 +83,33 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getType$(){
- if (this.type ==0) {
- return "鍏ュ簱";
- } else if (this.type == 1) {
- return "鍑哄簱";
- } else if (this.type == 2) {
- return "搴撲綅绉昏浆";
- } else if (this.type == 3) {
- return "搴撳瓨璋冩暣";
- }else {
- return "";
+ /**
+ * {0:鍏ュ簱,1:鍑哄簱,2.璋冩嫧鍏ワ紝3.璋冩嫧鍑猴紝4.棰嗘枡鍑簘
+ */
+ public String getType$() {
+ switch (this.type) {
+ case 0:
+ return "鍏ュ簱";
+ case 1:
+ return "鍑哄簱";
+ case 2:
+ return "璋冩嫧鍏�";
+ case 3:
+ return "璋冩嫧鍑�";
+ case 4:
+ return "棰嗘枡鍑�";
+ default:
+ return "";
}
+ }
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4dbf2d1..7bdb185 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -195,7 +195,7 @@
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', edit:'text'}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
diff --git a/src/main/webapp/static/js/ioWorks/stockIn.js b/src/main/webapp/static/js/ioWorks/stockIn.js
index 0bc2281..8662788 100644
--- a/src/main/webapp/static/js/ioWorks/stockIn.js
+++ b/src/main/webapp/static/js/ioWorks/stockIn.js
@@ -39,7 +39,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matnr, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, obj.field, obj.value);
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -119,18 +119,21 @@
}
}
- function updateMatCodeData(matnr, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matnr"] === matnr){
- matCodeData[i]["count"] = count;
- }
- }
- } else {
+ function updateMatCodeData(matnr, count, value) {
+ if (field === 'count') {
+ if (isNaN(value)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
+ return;
+ } else if (value <= 0) {
layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ return;
+ }
+ }
+
+ // 鉁� 閬嶅巻鏁扮粍鏇存柊瀵瑰簲瀛楁
+ for (var i = 0; i < matCodeData.length; i++) {
+ if (matCodeData[i]["matnr"] === matnr) {
+ matCodeData[i][field] = value;
}
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ad09170..f2f5fc5 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -104,7 +104,7 @@
layer.open({
type: 1,
title: false,
- area: '820px',
+ area: '1000px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -128,6 +128,9 @@
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+ {field: 'supp', title: '婧愬簱浣�'},
+ {field: 'suppCode', title: '鐩爣搴撲綅'},
+ {field: 'inspect$', title: '鏄惁涓婃姤'}
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -136,7 +139,7 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
+ // {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
@@ -238,6 +241,8 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
+ {field: 'supp', title: '婧愬簱浣�', edit: true},
+ {field: 'suppCode', title: '鐩爣搴撲綅', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index 5505981..515d284 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -28,7 +28,7 @@
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'createBy', align: 'center',title: '鎿嶄綔璐﹀彿'}
+ ,{field: 'createBy$', align: 'center',title: '鎿嶄綔璐﹀彿'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
// ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -232,6 +232,18 @@
}
layDateRender();
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#io_time\\$',
+ type: 'datetime'
+ });
+
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html
index d4a5157..159929d 100644
--- a/src/main/webapp/views/saasLog/saasLog.html
+++ b/src/main/webapp/views/saasLog/saasLog.html
@@ -18,18 +18,37 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <div class="layui-input-inline">
+ <select name="type">
+ <option value="">鎿嶄綔绫诲瀷</option>
+ <option value="0">鍏ュ簱</option>
+ <option value="1">鍑哄簱</option>
+ <option value="2">璋冩嫧鍏�</option>
+ <option value="3">璋冩嫧鍑�</option>
+ <option value="4">棰嗘枡鍑�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="loc_no" placeholder="搴撲綅" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栧彿:</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡缂栧彿" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" 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="io_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
--
Gitblit v1.9.1