From 84c3747ce74834a2188419df88cec851eff100b8 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期六, 19 三月 2022 16:39:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java | 2
src/main/resources/mapper/QualityDetlMapper.xml | 10
src/main/java/zy/cloud/wms/manager/entity/Quality.java | 78 +++++-----
src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java | 3
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 134 ++++++++++++++++++
src/main/java/zy/cloud/wms/manager/service/WorkService.java | 2
src/main/webapp/views/quality/waitMatoutQuery.html | 18 ++
src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java | 107 +++++++++-----
src/main/webapp/static/js/ioWorks/stockIn.js | 11 +
src/main/resources/mapper/QualityMapper.xml | 8
src/main/webapp/static/js/quality/quality.js | 20 +-
src/main/java/zy/cloud/wms/common/model/MatnrDto.java | 2
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 5
13 files changed, 293 insertions(+), 107 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/model/MatnrDto.java b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
index e5f4b3a..1612c11 100644
--- a/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
+++ b/src/main/java/zy/cloud/wms/common/model/MatnrDto.java
@@ -12,4 +12,6 @@
private Double count;
+ private String batch;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 3729af4..adccc5e 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -152,6 +152,11 @@
return R.ok().add(orderNo);
}
+ @RequestMapping("/receive/init")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ public R initReceive(@RequestBody InitOrderParam param) {
+ return workService.initReceive(param, getUserId(), getHostId());
+ }
@RequestMapping("/order/init")
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
public R initOrder(@RequestBody InitOrderParam param) {
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Quality.java b/src/main/java/zy/cloud/wms/manager/entity/Quality.java
index bbcb83c..6ec90b5 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Quality.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Quality.java
@@ -71,45 +71,45 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
+ @TableField("update_by")
+ private Long updateBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
+ private Date updateTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
+ @TableField("create_by")
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("create_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
+ private Date createTime;
public Quality() {}
- public Quality(Long id,Long hostId,String uuid,String billNo,Short auditStatus,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public Quality(Long id,Long hostId,String uuid,String billNo,Short auditStatus,String memo,Long updateBy,Date updateTime,Long createBy,Date createTime) {
this.id = id;
this.hostId = hostId;
this.uuid = uuid;
this.billNo = billNo;
this.auditStatus = auditStatus;
this.memo = memo;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.createBy = createBy;
+ this.createTime = createTime;
}
// Quality quality = new Quality(
@@ -185,68 +185,68 @@
this.memo = memo;
}
- public Long getModiUser() {
- return modiUser;
+ public Long getUpdateBy() {
+ return updateBy;
}
- public String getModiUser$(){
+ public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
}
- public Date getModiTime() {
- return modiTime;
+ public Date getUpdateTime() {
+ return updateTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
}
- public Long getAppeUser() {
- return appeUser;
+ public Long getCreateBy() {
+ return createBy;
}
- public String getAppeUser$(){
+ public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
+ public void setCreateBy(Long createBy) {
+ this.createBy = createBy;
}
- public Date getAppeTime() {
- return appeTime;
+ public Date getCreateTime() {
+ return createTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
index 14dd164..242255f 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java
@@ -162,35 +162,50 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
+ @TableField("update_by")
+ private Long updateBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
+ private Date updateTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
+ @TableField("create_by")
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("create_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
+ private Date createTime;
+
+ /**
+ * 璐ㄦ浜哄憳
+ */
+ @ApiModelProperty(value= "璐ㄦ浜哄憳")
+ @TableField("qua_user")
+ private String quaUser;
+
+ /**
+ * 璐ㄦ鏃堕棿
+ */
+ @ApiModelProperty(value= "璐ㄦ鏃堕棿")
+ @TableField("qua_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date quaDate;
public QualityDetl() {}
- public QualityDetl(Long hostId,Long qualityId,String billNo,Integer seqNo,String orderNo,Double anfme,String matnr,String maktx,String specs,String model,String batch,String unit,Date prodDate,Double rejectQty,String rejectReason,Integer quaStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public QualityDetl(Long hostId,Long qualityId,String billNo,Integer seqNo,String orderNo,Double anfme,String matnr,String maktx,String specs,String model,String batch,String unit,Date prodDate,Double rejectQty,String rejectReason,Integer quaStatus,Long updateBy,Date updateTime,Long createBy,Date createTime,String quaUser,Date quaDate) {
this.hostId = hostId;
this.qualityId = qualityId;
this.billNo = billNo;
@@ -207,10 +222,12 @@
this.rejectQty = rejectQty;
this.rejectReason = rejectReason;
this.quaStatus = quaStatus;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.quaUser = quaUser;
+ this.quaDate = quaDate;
}
// QualityDetl qualityDetl = new QualityDetl(
@@ -401,69 +418,81 @@
this.memo = memo;
}
- public Long getModiUser() {
- return modiUser;
+ public Long getUpdateBy() {
+ return updateBy;
}
- public String getModiUser$(){
+ public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
}
- public Date getModiTime() {
- return modiTime;
+ public Date getUpdateTime() {
+ return updateTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
}
- public Long getAppeUser() {
- return appeUser;
+ public Long getCreateBy() {
+ return createBy;
}
- public String getAppeUser$(){
+ public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
+ public void setCreateBy(Long createBy) {
+ this.createBy = createBy;
}
- public Date getAppeTime() {
- return appeTime;
+ public Date getCreateTime() {
+ return createTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
}
+ public Date getQuaDate() {
+ return quaDate;
+ }
+ public String getQuaDate$(){
+ if (Cools.isEmpty(this.quaDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.quaDate);
+ }
+ public void setQuaDate(Date quaDate) {
+ this.quaDate = quaDate;
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
index 544c36b..03e00f3 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ReceiveDetl.java
@@ -1,5 +1,7 @@
package zy.cloud.wms.manager.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
@@ -57,6 +59,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value= "")
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
index 2c1f60f..31ec7c1 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/PakoutParam.java
@@ -17,4 +17,6 @@
private Double count;
+ private String batch;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/WorkService.java b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
index 5801b1f..4a9138c 100644
--- a/src/main/java/zy/cloud/wms/manager/service/WorkService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/WorkService.java
@@ -35,6 +35,8 @@
R initOrder(InitOrderParam param, Long userId, Long hostId);
+ R initReceive(InitOrderParam param, Long userId, Long hostId);
+
R stockCheck(StoCheckParam param, Long userId, Long hostId);
R stockCheckAuditing(Long checkId, Long userId, Long hostId);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index c92e900..1728c29 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -60,7 +60,8 @@
private ReceiveService receiveService;
@Autowired
private ReceiveDetlService receiveDetlService;
-
+ @Autowired
+ ReceiveLogService receiveLogService;
@Override
@@ -116,6 +117,23 @@
if (!pakinService.insert(pakin)) {
throw new CoolException("淇濆瓨鍏ュ簱璁板綍澶辫触");
}
+
+ /**
+ * 涓婃灦瀹屾垚涔嬪悗,瀛樻斁鏁版嵁鑷充笂鏋剁粺璁¤〃 man_receive_log
+ */
+ ReceiveLog receiveLog = new ReceiveLog();
+ receiveLog.setOrderNo("");//鍗曞彿
+ receiveLog.setNodeId(node.getId());//搴撲綅鍙穒d
+ receiveLog.setNodeName(node.getName());//搴撲綅鍚嶇О
+ receiveLog.setMatnr(dto.getMatnr());//鐗╂枡缂栫爜
+ receiveLog.setAnfme(dto.getCount());//鏁伴噺
+ receiveLog.setBatch(dto.getBatch());//鎵瑰彿
+ receiveLog.setCreateBy(userId);//娣诲姞浜哄憳
+ receiveLog.setUpdateBy(userId);//淇敼浜哄憳
+ receiveLog.setCreateTime(now);
+ receiveLog.setUpdateTime(now);
+ receiveLog.setIoType(1);
+ receiveLogService.insert(receiveLog);
// 淇敼搴撳瓨
LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr());
if (locDetl == null) {
@@ -127,6 +145,7 @@
locDetl.setZpallet("");
locDetl.setAnfme(dto.getCount());
VersionUtils.setLocDetl(locDetl, mat);
+ locDetl.setBatch(dto.getBatch());
// locDetl.setDocId(param.getDocType().longValue());
// locDetl.setDocNum(docNum);
locDetl.setStatus(1);
@@ -564,13 +583,11 @@
}
return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
-
@Override
@Transactional
- public R initOrder(InitOrderParam param, Long userId, Long hostId) {
+ public R initReceive(InitOrderParam param, Long userId, Long hostId){
Receive order_no = receiveService.selectOne(new EntityWrapper<Receive>()
.eq("order_no", param.getOrderNo()));
-// Order order = orderService.selectByOrderNo(param.getOrderNo(), hostId);
if (order_no != null) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
}
@@ -615,10 +632,115 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ if (!receiveService.insert(order_no)) {
+ throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
+ }
+
+ // 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
+ for (MatnrDto dto : param.getList()){
+ Mat mat = matService.selectByMatnr(hostId, dto.getMatnr());
+ if (mat == null) {
+ log.error("{}鍟嗗搧涓嶅瓨鍦ㄣ��", dto.getMatnr());
+ continue;
+ }
+ ReceiveDetl receiveDetl = new ReceiveDetl();
+ receiveDetl.setHostId(hostId);
+ receiveDetl.setOrderId(order_no.getId());
+ receiveDetl.setAnfme(dto.getCount());
+ receiveDetl.setCreateTime(now);
+ receiveDetl.setCreateBy(userId);
+ receiveDetl.setUpdateBy(userId);
+ receiveDetl.setUpdateTime(now);
+ receiveDetl.setStatus(1);
+ receiveDetl.setMatnr(mat.getMatnr());
+ receiveDetl.setMaktx(mat.getMaktx());
+ receiveDetl.setName(mat.getName());
+ receiveDetl.setSpecs(mat.getSpecs());
+ receiveDetl.setModel(mat.getModel());
+ receiveDetl.setBatch(mat.getBatch());
+ receiveDetl.setUnit(mat.getUnit());
+ receiveDetl.setBarcode(mat.getBarcode());
+ receiveDetl.setItemNum(mat.getItemNum());
+ receiveDetl.setCount(dto.getCount());
+ receiveDetl.setUnitPrice(mat.getPrice());
+ receiveDetl.setWeight(mat.getWeight());
+ if (!receiveDetlService.insert(receiveDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
+ }
+ }
+ return R.ok("鍒涘缓璁㈠崟鎴愬姛");
+ }
+
+ @Override
+ @Transactional
+ public R initOrder(InitOrderParam param, Long userId, Long hostId) {
+ // Receive order_no = receiveService.selectOne(new EntityWrapper<Receive>()
+ // .eq("order_no", param.getOrderNo()));
+ Order order = orderService.selectByOrderNo(param.getOrderNo(), hostId);
+ if (order != null) {
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
+ }
+ Date now = new Date();
+ Item item = itemService.selectByName(param.getItem());
+ Cstmr cstmr = cstmrService.selectByName(param.getCstmr());
+ // 鏂板璁㈠崟琛ㄥご
+ Order order1 = new Order();
+ order1.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ order1.setHostId(hostId);
+ order1.setOrderNo(param.getOrderNo());
+ order1.setOrderTime(param.getOrderTime());
+ order1.setDocType(param.getDocType());
+ order1.setItemId(item.getId());
+ order1.setItemName(param.getItem());
+ order1.setCstmr(cstmr.getId());
+ order1.setCstmrName(param.getCstmr());
+ order1.setSettle(1L);
+ order1.setStatus(1);
+ order1.setCreateBy(userId);
+ order1.setCreateTime(now);
+ order1.setUpdateBy(userId);
+ order1.setUpdateTime(now);
+// order_no = new Receive(
+// hostId,
+// String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+// param.getOrderNo(), // 璁㈠崟缂栧彿
+// param.getOrderTime(), // 鍗曟嵁鏃ユ湡
+// param.getDocType(), // 鍗曟嵁绫诲瀷
+// item==null?null:item.getId(), // 椤圭洰缂栧彿
+// param.getItem(), // 椤圭洰鍚嶇О
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// cstmr==null?null:cstmr.getId(), // 瀹㈡埛缂栧彿
+// param.getCstmr(), // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// 1L, // 璁㈠崟鐘舵��
+// 1, // 鐘舵��
+// userId, // 娣诲姞浜哄憳
+// now, // 娣诲姞鏃堕棿
+// userId, // 淇敼浜哄憳
+// now, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
// if (!orderService.insert(order)) {
// throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
// }
- if (!receiveService.insert(order_no)) {
+ if (!orderService.insert(order1)) {
throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
}
@@ -652,7 +774,7 @@
}
ReceiveDetl receiveDetl = new ReceiveDetl();
receiveDetl.setHostId(hostId);
- receiveDetl.setOrderId(order_no.getId());
+ receiveDetl.setOrderId(order1.getId());
receiveDetl.setAnfme(dto.getCount());
receiveDetl.setCreateTime(now);
receiveDetl.setCreateBy(userId);
diff --git a/src/main/resources/mapper/QualityDetlMapper.xml b/src/main/resources/mapper/QualityDetlMapper.xml
index cc0f12a..6a7c9b2 100644
--- a/src/main/resources/mapper/QualityDetlMapper.xml
+++ b/src/main/resources/mapper/QualityDetlMapper.xml
@@ -22,10 +22,12 @@
<result column="rejectReason" property="rejectReason" />
<result column="qua_status" property="quaStatus" />
<result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="qua_user" property="quaUser"/>
+ <result column="qua_date" property="quaDate"/>
</resultMap>
diff --git a/src/main/resources/mapper/QualityMapper.xml b/src/main/resources/mapper/QualityMapper.xml
index 28f6513..76a4428 100644
--- a/src/main/resources/mapper/QualityMapper.xml
+++ b/src/main/resources/mapper/QualityMapper.xml
@@ -10,10 +10,10 @@
<result column="bill_no" property="billNo" />
<result column="audit_status" property="auditStatus" />
<result column="memo" property="memo" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
</resultMap>
diff --git a/src/main/webapp/static/js/ioWorks/stockIn.js b/src/main/webapp/static/js/ioWorks/stockIn.js
index eed7ff0..89adcc6 100644
--- a/src/main/webapp/static/js/ioWorks/stockIn.js
+++ b/src/main/webapp/static/js/ioWorks/stockIn.js
@@ -1,9 +1,11 @@
var initCountVal = 0;
+var initBatchVal='';
var matCodeData = [];
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ ,{fixed: 'left', field: 'batch', title: '鎵瑰彿', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
];
cols.push.apply(cols, matCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
@@ -32,6 +34,7 @@
cols: [getCol()],
done: function (res, curr, count) {
$('td[data-field=count] div').html(initCountVal);
+ $('td[data-field=batch] div').html(initBatchVal);
setMatCodeData(res.data);
limit();
}
@@ -39,7 +42,8 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matnr, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, Number(obj.field.count),batch(obj.field.batch));
+
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -115,10 +119,11 @@
matCodeData = data;
for (var i=0;i<matCodeData.length;i++){
matCodeData[i]["count"] = initCountVal;
+ matCodeData[i]["batch"] = initBatchVal;
}
}
- function updateMatCodeData(matnr, count) {
+ function updateMatCodeData(matnr, count,batch) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
@@ -126,6 +131,7 @@
for (var i=0;i<matCodeData.length;i++){
if (matCodeData[i]["matnr"] === matnr){
matCodeData[i]["count"] = count;
+ matCodeData[i]["batch"] = batch;
}
}
} else {
@@ -265,6 +271,7 @@
data.splice(i--, 1);
} else {
data[i]["count"] = initCountVal;
+ data[i]["batch"] = initBatchVal;
}
}
matCodeData.push.apply(matCodeData, data);
diff --git a/src/main/webapp/static/js/quality/quality.js b/src/main/webapp/static/js/quality/quality.js
index c5e961f..c0b6e7c 100644
--- a/src/main/webapp/static/js/quality/quality.js
+++ b/src/main/webapp/static/js/quality/quality.js
@@ -168,18 +168,18 @@
page: true,
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
+ // {type: 'numbers'},
// {field: 'billNo', title: '妫�楠岀紪鍙�', align: 'center'},
- {field: 'seqNo', title: '鍗曟嵁琛屽彿', align: 'center'},
- {field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center'},
- {field: 'anfme', title: '寰呭叆搴撴暟閲�', align: 'center'},
- {field: 'matnr', title: '浜у搧ID', align: 'center'},
- {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center'},
+ {field: 'seqNo', title: '鍗曟嵁琛屽彿', align: 'center',width: 100},
+ {field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center',width: 150},
+ {field: 'anfme', title: '寰呭叆搴撴暟閲�', align: 'center',width: 100},
+ {field: 'matnr', title: '浜у搧ID', align: 'center',width: 150},
+ {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center',width: 150},
// {field: 'maktx', title: '浜у搧鍚嶇О', align: 'center'},
- {field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center'},
- {field: 'quaStatus', title: '妫�楠岀姸鎬�', align: 'center'},
- {field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'},
- {field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center'},
+ {field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center',width: 150},
+ {field: 'quaStatus$', title: '妫�楠岀姸鎬�', align: 'center',width: 100},
+ {field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center',width: 100},
+ {field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center',width: 150},
]],
request: {
diff --git a/src/main/webapp/views/quality/waitMatoutQuery.html b/src/main/webapp/views/quality/waitMatoutQuery.html
index 259364d..ccbcb6b 100644
--- a/src/main/webapp/views/quality/waitMatoutQuery.html
+++ b/src/main/webapp/views/quality/waitMatoutQuery.html
@@ -170,9 +170,13 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鐘舵��: </label>
+ <label class="layui-form-label">瀹℃牳鐘舵��: </label>
<div class="layui-input-block">
- <input class="layui-input" name="quaStatus" placeholder="璇疯緭鍏�" disabled>
+ <select name="quaStatus">
+ <option value="0">寰呮</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
</div>
</div>
</div>
@@ -206,7 +210,7 @@
,{field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center'}
,{field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'}
,{field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center'}
- ,{field: 'quaStatus', title: '涔嬮棿鐘舵��', align: 'center'}
+ ,{field: 'quaStatus$', title: '璐ㄦ鐘舵��', align: 'center'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operateCheck', width:140}
// ,{field: 'orderNo', title: '璁㈠崟鍙�', width:115, align: 'center'}
// ,{field: 'specs', align: 'center',title: '灞炴��'}
@@ -290,6 +294,14 @@
layDateRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ if(data.field.rejectQty<0){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙皬浜�0")
+ return;
+ }
+ if(data.field.rejectQty>data.field.anfme){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙ぇ浜庡叆搴撴暟閲�");
+ return;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/qualityDetl/"+(mData?'update':'add')+"/auth",
--
Gitblit v1.9.1