From d4422021440e7008c200b8aa4e5196966209644d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 26 六月 2023 14:02:25 +0800
Subject: [PATCH] #PDA增加订单组托、订单上架(托盘码)
---
src/main/resources/mapper/ManLocDetlMapper.xml | 3 +
src/main/resources/mapper/OrderMapper.xml | 4 +
src/main/java/com/zy/asrs/controller/OrderController.java | 15 +++++
src/main/java/com/zy/asrs/entity/OrderListDTO.java | 8 ++
src/main/webapp/views/manLocDetl/manLocDetl.html | 12 +++-
src/main/java/com/zy/asrs/service/OrderService.java | 7 +-
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 5 +
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 81 +++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 9 +++
src/main/java/com/zy/asrs/service/MobileService.java | 2
12 files changed, 142 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e4f39f9..0d7da79 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -360,4 +360,13 @@
return mobileService.manDetlOut(json , getUser());
}
+ @RequestMapping("/manDetl/in/barcode")
+ @ManagerAuth(memo = "璁㈠崟涓婃灦(鎵樼洏鐮�)")
+ public R manDetlAddbarcode(@RequestBody JSONObject json){
+ if (json == null){
+ return R.error("浼犲叆鏁版嵁涓虹┖");
+ }
+ return mobileService.manDetlInBarcode(json,getUser());
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 518712b..57f2eb4 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,6 +9,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.service.*;
@@ -411,4 +412,18 @@
.doWrite(list);
}
+ @RequestMapping(value = "/order/list/all")
+ public R orderList() {
+
+ return R.ok(orderService.selectAllorderNo());
+ }
+
+ @RequestMapping(value = "/order/list/orderNo")
+ public R orderListorderNo(@RequestParam String orderNo) {
+
+ return R.ok(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",orderNo)));
+ }
+
+
+
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderListDTO.java b/src/main/java/com/zy/asrs/entity/OrderListDTO.java
new file mode 100644
index 0000000..09d3504
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderListDTO.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+@Data
+public class OrderListDTO {
+ private String order_no;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index af74849..7075216 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderListDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -26,4 +27,5 @@
List<Order> selectToBeHistoryOrder(@Param("settle")int settle);
+ List<OrderListDTO> selectAllorderNo();
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 048c34f..c57dcae 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -44,4 +44,6 @@
R manDetlIn(JSONObject json ,User user);
R manDetlOut(JSONObject json,User user);
+ R manDetlInBarcode(JSONObject json ,User user);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 50afa6b..52e0487 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.*;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
import java.util.List;
@@ -33,4 +30,6 @@
void checkSettleUpdate(Long orderId);
List<Order> selectToBeHistoryOrder(boolean isERP);
+
+ List<OrderListDTO> selectAllorderNo();
}
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 381c01f..97f4c90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -81,6 +82,9 @@
private ManLocDetlService manLocDetlService;
@Autowired
private ManLocDetlMapper manLocDetlMapper;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
+
@Override
@@ -732,4 +736,81 @@
}
return R.ok("涓嬫灦瀹屾垚");
}
+
+ @Override
+ public R manDetlInBarcode(JSONObject json, User user) {
+ String jsonLocNo = (String) json.get("locNo"); //鑾峰彇搴撲綅鐮�
+ String jsonBarNo = (String) json.get("barcode"); //鑾峰彇鎵樼洏鐮�
+
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", jsonBarNo)); //鑾峰彇瀵瑰簲缁勬墭淇℃伅
+ if (waitPakin.equals(null)){
+ return R.error("鏈煡璇㈠埌缁勬墭");
+ } else if (waitPakin.getIoStatus() == "Y") {
+ return R.error("缁勬墭宸茬粡鐢熸垚宸ヤ綔妗�");
+ }
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", waitPakin.getOrderNo())); //鑾峰彇瀵瑰簲璁㈠崟淇℃伅
+ if (order.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟淇℃伅");
+ }
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", waitPakin.
+ getOrderNo()).eq("matnr", waitPakin.getMatnr())); //鑾峰彇瀵瑰簲璁㈠崟鏄庣粏淇℃伅
+ if (orderDetl.equals(null)){
+ return R.error("鏈煡璇㈠埌璁㈠崟鏄庣粏淇℃伅");
+ }
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo)); //鑾峰彇瀵瑰簲搴撲綅淇℃伅
+ if (node.equals(null)){
+ return R.error("鏈煡璇㈠埌搴撲綅淇℃伅");
+ }
+ Date date = new Date();
+ ManLocDetl manLocDetl = new ManLocDetl(); //鍒濆鍖栧簱瀛樺疄浣撶被
+ manLocDetl.setLocNo(node.getName());
+ manLocDetl.setNodeId(node.getId());
+ manLocDetl.setZpallet(waitPakin.getZpallet());
+ manLocDetl.setAnfme(waitPakin.getAnfme());
+ manLocDetl.setMatnr(waitPakin.getMatnr());
+ manLocDetl.setMaktx(waitPakin.getMaktx());
+ manLocDetl.setStatus(1);
+ manLocDetl.setCreateBy(user.getId());
+ manLocDetl.setCreateTime(date);
+ manLocDetl.setUpdateBy(user.getId());
+ manLocDetl.setModiTime(date);
+ manLocDetl.setOrderNo(waitPakin.getOrderNo());
+ manLocDetl.setOwner(waitPakin.getOwner());
+ manLocDetl.setPayment(waitPakin.getPayment());
+
+ if (!manLocDetlService.insert(manLocDetl)){ //鏁版嵁搴撴彃鍏ュ疄浣撶被淇℃伅
+ return R.error("鐗╂枡淇℃伅鍏ュ簱澶辫触");
+ }
+ orderDetl.setQty(orderDetl.getQty()+ waitPakin.getAnfme()); //鏇存柊璁㈠崟鏄庣粏鏁伴噺
+ if (!orderDetlService.updateById(orderDetl)){
+ return R.error("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
+
+ WaitPakinLog waitPakinLog = new WaitPakinLog(); //鍒濆鍖栧叆搴撻�氱煡鍗曟棩蹇楀疄浣撶被
+ waitPakinLog.setZpallet(waitPakin.getZpallet());
+ waitPakinLog.setAnfme(waitPakin.getAnfme());
+ waitPakinLog.setMatnr(waitPakin.getMatnr());
+ waitPakinLog.setLocNo(waitPakin.getLocNo());
+ waitPakinLog.setMaktx(waitPakin.getMaktx());
+ waitPakinLog.setOrderNo(waitPakin.getOrderNo());
+ waitPakinLog.setWeight(waitPakin.getWeight());
+ waitPakinLog.setStatus("Y");
+ waitPakinLog.setIoStatus("Y");
+ waitPakinLog.setModiUser(user.getId());
+ waitPakinLog.setModiTime(date);
+ waitPakinLog.setAppeUser(user.getId());
+ waitPakinLog.setAppeTime(date);
+ waitPakinLog.setOwner(waitPakin.getOwner());
+ waitPakinLog.setPayment(waitPakin.getPayment());
+ waitPakinLog.setUuid(waitPakin.getUuid());
+
+ if (!waitPakinLogService.insert(waitPakinLog)){ //鎻掑叆鍏ュ簱閫氱煡鍘嗗彶妗ｆ暟鎹簱
+ return R.error("鎻掑叆鍘嗗彶鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",jsonBarNo))){ //鍒犻櫎鍘熷叆搴撻�氱煡妗�
+ return R.error("鍒犻櫎鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ return R.ok("涓婃灦鎴愬姛");
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2872ba5..02faf58 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -208,4 +208,9 @@
return this.baseMapper.selectToBeHistoryOrder(settle);
}
+ @Override
+ public List<OrderListDTO> selectAllorderNo() {
+ return this.baseMapper.selectAllorderNo();
+ }
+
}
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index e1fef14..395c9db 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -52,6 +52,9 @@
<if test="maktx != null and maktx != ''">
and mld.maktx like concat('%',#{maktx},'%')
</if>
+ <if test="zpallet != null and zpallet != ''">
+ and mld.zpallet like concat('%',#{zpallet},'%')
+ </if>
<if test="startTime!=null and endTime!=null">
and mld.update_time between #{startTime} and #{endTime}
</if>
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 469f28f..956aaec 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -78,6 +78,10 @@
and settle = #{settle}
order by create_time asc
</select>
+ <select id="selectAllorderNo" resultType="com.zy.asrs.entity.OrderListDTO">
+ select order_no from man_order
+ </select>
+
<insert id="addToLogTable">
INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 6e77b6f..b43cdf8 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -10,7 +10,7 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true, hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- //,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/src/main/webapp/views/manLocDetl/manLocDetl.html b/src/main/webapp/views/manLocDetl/manLocDetl.html
index ffe7e56..60039c9 100644
--- a/src/main/webapp/views/manLocDetl/manLocDetl.html
+++ b/src/main/webapp/views/manLocDetl/manLocDetl.html
@@ -71,19 +71,25 @@
<div class="layui-inline">
<label class="layui-form-label" style="padding: 8px 15px 8px 15px">璐т綅:</label>
<div class="layui-input-inline">
- <input name="loc_no" class="layui-input" placeholder="杈撳叆璐т綅"/>
+ <input name="loc_no" style="width: 120px" class="layui-input" placeholder="杈撳叆璐т綅"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧缂栧彿:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
+ <input name="matnr" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍟嗗搧鍚嶇О:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ <input name="maktx" style="width: 120px" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鎵樼洏鐮�:</label>
+ <div class="layui-input-inline">
+ <input name="zpallet" style="width: 120px" class="layui-input" placeholder="杈撳叆鎵樼洏鐮�"/>
</div>
</div>
<div class="layui-inline"> 
--
Gitblit v1.9.1