From 80f43ee95117ae2e22077ca4a62d6606b9e22fb7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 07 四月 2022 15:45:46 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/Cstmr.java | 97 --------------------------------
src/main/webapp/views/itemManager/itemManager.html | 3
src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java | 1
src/main/java/zy/cloud/wms/manager/entity/Item.java | 2
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 18 +++++
src/main/resources/mapper/CstmrMapper.xml | 1
src/main/webapp/static/js/item/item.js | 2
7 files changed, 23 insertions(+), 101 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 01e0660..f694ae0 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -30,6 +30,8 @@
private ProjectPlanService planService;
@Autowired
private FlowStatusService flowStatusService;
+ @Autowired
+ private CstmrService cstmrService;
@RequestMapping(value = "/item/{id}/auth")
@ManagerAuth
@@ -106,10 +108,13 @@
@RequestMapping(value = "/item/add/auth")
@ManagerAuth
public R add(Item item) {
-
+ /**
+ * 鎺х
+ */
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
+
//item.setType("1");
// if (!item.getType().equals("1")) {
// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
@@ -122,7 +127,18 @@
if (item.getRealMonth() < 0){
throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
}
+ if (Cools.isEmpty(item.getCstmrUuid())) {
+ throw new CoolException("璇烽�夋嫨瀹㈡埛");
+ }
+ Cstmr cstmr = cstmrService.selectOne(new EntityWrapper<Cstmr>()
+ .eq("id",Long.parseLong(item.getUuid())));
+ if (Cools.isEmpty(cstmr)) {
+ throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
+ }
+ item.setCustMan(cstmr.getName());
+ item.setCustMobile(cstmr.getTel());
+ item.setCustAdress(cstmr.getAddr());
item.setHostId(getHostId());
item.setCreateBy(getUserId());
item.setCreateTime(new Date());
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java b/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
index 977c23a..802ec5b 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Cstmr.java
@@ -128,21 +128,7 @@
// null // 澶囨敞
// );
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getHostId() {
- return hostId;
- }
-
- public void setHostId(Long hostId) {
- this.hostId = hostId;
- }
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
@@ -153,49 +139,6 @@
return null;
}
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getContacts() {
- return contacts;
- }
-
- public void setContacts(String contacts) {
- this.contacts = contacts;
- }
-
- public String getTel() {
- return tel;
- }
-
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getAddr() {
- return addr;
- }
-
- public void setAddr(String addr) {
- this.addr = addr;
- }
-
- public Integer getStatus() {
- return status;
- }
public String getStatus$(){
if (null == this.status){ return null; }
@@ -209,13 +152,6 @@
}
}
- public void setStatus(Integer status) {
- this.status = status;
- }
-
- public Long getCreateBy() {
- return createBy;
- }
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -226,14 +162,6 @@
return null;
}
- public void setCreateBy(Long createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
@@ -241,13 +169,7 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- public Long getUpdateBy() {
- return updateBy;
- }
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -258,13 +180,7 @@
return null;
}
- public void setUpdateBy(Long updateBy) {
- this.updateBy = updateBy;
- }
- public Date getUpdateTime() {
- return updateTime;
- }
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
@@ -272,18 +188,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 035973d..ac5887c 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -364,7 +364,7 @@
*/
@ApiModelProperty(value= "棰勮杞﹁締鏁伴噺")
@TableField("planCarnumber")
- private Integer planCarnumber;
+ private String planCarnumber;
/**
* 瓒呭嚭閲戦
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
index 3fa1897..2dab91e 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java
@@ -47,6 +47,7 @@
@Transactional
@Override
public void insertAll(Item item) {
+
this.insert(item);
List<FlowStatus> allTypes = flowStatusService.selectList(new EntityWrapper<FlowStatus>()
.eq("type", item.getType())
diff --git a/src/main/resources/mapper/CstmrMapper.xml b/src/main/resources/mapper/CstmrMapper.xml
index 2b17b77..0065227 100644
--- a/src/main/resources/mapper/CstmrMapper.xml
+++ b/src/main/resources/mapper/CstmrMapper.xml
@@ -17,6 +17,7 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="user_code" property="userCode" />
</resultMap>
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 15f5edd..b939daa 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -39,7 +39,7 @@
,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
- ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)'}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/views/itemManager/itemManager.html b/src/main/webapp/views/itemManager/itemManager.html
index c895f9f..8dfcfa5 100644
--- a/src/main/webapp/views/itemManager/itemManager.html
+++ b/src/main/webapp/views/itemManager/itemManager.html
@@ -114,7 +114,8 @@
<div class="layui-form-item">
<label class="layui-form-label">棰勮杞﹁締鏁伴噺: </label>
<div class="layui-input-block">
- <input class="layui-input" name="planCarnumber" onkeyup="value=value.replace(/[^\d]/g,'').replace(/^0{1,}/g,'')" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">
+<!-- <input class="layui-input" name="planCarnumber" onkeyup="value=value.replace(/[^\d]/g,'').replace(/^0{1,}/g,'')" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">-->
+ <input class="layui-input" name="planCarnumber" placeholder="璇疯緭鍏ラ璁¤溅杈嗗ぇ灏�">
</div>
</div>
</div>
--
Gitblit v1.9.1