From eb17d664dd8c1957e2ca6668ac70b3d49dca7329 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 一月 2024 11:04:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/index.html | 12 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 85 ++++++++++------------------
src/main/java/com/zy/asrs/controller/MobileController.java | 58 +++++++++++++++++++
src/main/webapp/views/login.html | 2
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 15 ++--
src/main/webapp/static/image/logo.png | 0
6 files changed, 103 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 18bc6fe..1cd79f7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -71,6 +71,13 @@
return R.ok("涓嬫灦鎴愬姛");
}
+ @RequestMapping("/search/sign/auth/v2")
+// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+ public R orderSearchByBarcodeV2(@RequestParam boolean sign){
+ Integer signRu = 1;
+ return R.ok(signRu);
+ }
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -144,6 +151,57 @@
return R.ok().add(combParams);
}
+ @RequestMapping("/order/search/orderNo/auth/v2")
+ @ManagerAuth(memo = "閫�搴撳崟鑾峰彇")
+ public R orderSearchByBarcodeV2(@RequestParam String orderNo){
+ if (Cools.isEmpty(orderNo)){
+ orderNo=null;
+ }
+ List<Order> orders = orderService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)){
+ return R.ok();
+ }
+ LinkedList<CombParam> combParams = new LinkedList<>();
+ if (!Cools.isEmpty(orders)){
+ for (Order order:orders){
+ CombParam combParam=new CombParam();
+ if (order == null) {
+ continue;
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1 || !docType.getDocName().equals("閫�璐у叆搴撳崟")) {
+ continue;
+ }
+ if (order.getSettle() > 2) {
+ continue;
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+ for (OrderDetl orderDetl:orderDetls){
+ if (orderDetl.getWorkQty()!=0){
+ continue;
+ }
+ CombParam.CombMat combMat = new CombParam.CombMat();
+ combMat.setMatnr(orderDetl.getMatnr());
+ combMat.setBatch(orderDetl.getBatch());
+ combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
+ combMats.add(combMat);
+ }
+ if (combMats.size()==0){
+ continue;
+ }
+ combParam.setCombMats(combMats);
+ }
+ combParam.setOrderNo(order.getOrderNo());
+ combParams.add(combParam);
+ }
+ }
+ return R.ok().add(combParams);
+ }
+
@RequestMapping("/wrkDetl/search/batch/auth")
@ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index 29fdbb0..cd25e71 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -20,17 +20,17 @@
public class TrussCombParam {
private String barcode;// 瀛楃涓� 鎵樼洏鐮� 璁㈠崟鍏辩敤 //涓婁紶
- private Integer souSta;// 瀛楃涓� 鎵樼洏鐮� 璁㈠崟鍏辩敤
+ private Integer souSta;// 瀛楃涓� 鍘熺珯鐐� 璁㈠崟鍏辩敤
private Integer palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
private Integer staStart;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙�
- private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶
+ private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶 //PDA
private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶
- private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶
+ private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶 //PDA
private String uuid;// 瀛楃涓� 鏃堕棿鎴� //涓婁紶
private String createTime;// 瀛楃涓� 鍒涘缓鏃堕棿
- private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶
+ private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶 //PDA
- private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶
+ private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶 //PDA
@Data
public static class MatList{
@@ -40,9 +40,10 @@
private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶
private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶
- private String batch;// 瀛楃涓� 绠卞彿
+ private String batch;// 瀛楃涓� 绠卞彿 //PDA
private String specs;// 瀛楃涓� 瑙勬牸
- private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
+ private String model;// 瀛楃涓� 瑙勬牸
+// private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭�
}
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 886ec7b..24e4e2d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -83,6 +83,8 @@
private ManLocDetlMapper manLocDetlMapper;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private LocDetlRullUpDetailService locDetlRullUpDetailService;
@Override
@@ -96,81 +98,53 @@
throw new CoolException("鍙傛暟锛氭墭鐩樼爜涓虹┖");
}
}
+ param.setPalletizingNo(147);
+
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getPalletizingNo())){
- throw new CoolException("鍙傛暟锛氱珯鐐圭紪鍙蜂负绌�");
- }else if (Cools.isEmpty(param.getOrderNo())){
- throw new CoolException("鍙傛暟锛氶��璐у崟鍗曞彿 orderNo涓虹┖");
- }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size() != 1){
- throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
- }else if (param.getSouSta()==145 || param.getMatList().size() != 1){
-
+ throw new CoolException("鍙傛暟锛氬師绔欑偣缂栧彿涓虹┖");
+ }else if (param.getSouSta()==145 && param.getMatList().size() != 1){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖ 鎴栬�� 澶т簬1涓槑缁�");
+ }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size() > 2){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖ 鎴栬�� 澶т簬2涓槑缁�");
}
- Order order = orderService.selectByNo(param.getOrderNo());
- if (Cools.isEmpty(order)){
- throw new CoolException("鏈煡璇㈠埌姝よ鍗曪紝鍗曞彿锛�"+param.getOrderNo());
- }
- DocType docType = docTypeService.selectById(order.getDocType());
- if (Cools.isEmpty(docType) || !docType.getDocName().equals("閫�璐у叆搴撳崟")){
- throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+"涓嶆槸閫�璐у叆搴撳崟");
- }
-
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- if (Cools.isEmpty(orderDetls) || orderDetls.size()==0){
- throw new CoolException("鏈煡璇㈠埌姝よ鍗曟槑缁嗭紝鍗曞彿锛�"+param.getOrderNo());
- }
- List<String> orderBoxNoList = new ArrayList<>();
- for (OrderDetl orderDetl: orderDetls){
- if (orderDetl.getWorkQty()==0){
- orderBoxNoList.add(orderDetl.getBatch());
- }
- }
- if (orderBoxNoList.size()==0 || orderBoxNoList.size()<param.getMatList().size()){
- throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 閫�璐ф暟閲忓ぇ浜庢槑缁嗘暟閲�");
- }
- List<String> matListBoxNoList = new ArrayList<>();
- for (TrussCombParam.MatList matList: param.getMatList()){
- if (!orderBoxNoList.contains(matList.getBoxNo())){
- throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
- }else {
- matListBoxNoList.add(matList.getBoxNo());
- }
- }
- List<OrderDetl> orderDetlList = new ArrayList<>();
- for (OrderDetl orderDetl: orderDetls){
- if (matListBoxNoList.contains(orderDetl.getBatch())){
- orderDetl.setBrand("1");
- orderDetlList.add(orderDetl);
- }
- }
String matnr = null;
List<WaitPakin> waitPakins = new ArrayList<>();
-
- for (OrderDetl orderDetl:orderDetlList){
- Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ for (TrussCombParam.MatList matList:param.getMatList()){
+ long rollUp = new Date().getTime();
+ Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
- throw new CoolException(orderDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
matnr = mat.getMatnr();
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setModel(orderDetl.getModel()); //鎵规
- waitPakin.setSpecs(orderDetl.getSpecs()); //瑙勬牸
- waitPakin.setBatch(orderDetl.getBatch()); //鏈ㄧ缂栫爜
+ waitPakin.setModel(matList.getModel()); //鎵规
+ waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
+ waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜
waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
- waitPakin.setOrigin(orderDetl.getOrigin()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+ waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
- waitPakin.setAnfme(orderDetl.getAnfme()); // 鏈ㄧ涓摐绠旀暟閲�
+ waitPakin.setAnfme((double)matList.getAnfme()); // 鏈ㄧ涓摐绠旀暟閲�
waitPakin.setStatus("Y"); // 鐘舵��
waitPakin.setAppeUser(userId);
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
- waitPakin.setRollUp(orderDetl.getRollUp());
+ waitPakin.setRollUp(rollUp);
+ if (!Cools.isEmpty(matList.getMatDetlList())){
+ for (TrussCombParam.MatDetlList matDetlList:matList.getMatDetlList()){
+ LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
+ locDetlRullUpDetail.setUuid(rollUp);
+ locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
+ locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
+ locDetlRullUpDetailService.insert(locDetlRullUpDetail);
+ }
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -240,6 +214,7 @@
public void trussCombOrder(TrussCombParam param, Long userId) {
Date now = new Date();
param.setBarcode(String.valueOf(now.getTime()));
+ param.setPalletizingNo(147);
//鍒ゆ柇param鍙傛暟
if (Cools.isEmpty(param.getPalletizingNo())){
@@ -274,7 +249,7 @@
}
List<String> matListBoxNoList = new ArrayList<>();
for (TrussCombParam.MatList matList: param.getMatList()){
- if (!orderBoxNoList.contains(matList.getBoxNo())){
+ if (!orderBoxNoList.contains(matList.getBatch())){
throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
}else {
matListBoxNoList.add(matList.getBoxNo());
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png
index e2fc662..d40e8cb 100644
--- a/src/main/webapp/static/image/logo.png
+++ b/src/main/webapp/static/image/logo.png
Binary files differ
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 865a049..3d177c6 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>涓壃 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
+ <title>寰愬伐姹変簯 - 鑷姩鍖栫珛浣撲粨搴� - AS / RS</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -26,10 +26,10 @@
<!-- 澶撮儴 -->
<div class="layui-header">
<div class="layui-logo">
- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">
+<!-- <img src="../static/image/logo.png" style="display: inline-block; width: 40%;height: auto">-->
<!-- <span style="margin-top: 0; letter-spacing: 10px">涓壃绔嬪簱</span>-->
- <!-- <img src="../static/image/logo.svg"/>-->
- <!-- <cite>涓壃 - Zoneyung</cite>-->
+ <img src="../static/image/favicon.ico"/>
+ <cite>寰愬伐姹変簯</cite>
</div>
<ul class="layui-nav layui-layout-left">
@@ -75,7 +75,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2022 <a href="https://zoneyung.com/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.
+ copyright 漏 2022 <a href="https://zoneyung.com/" target="_blank">寰愬伐姹変簯</a> all rights reserved.
<span class="pull-right">Version 1.0.0</span>
</div>
@@ -91,7 +91,7 @@
<script type="text/javascript" src="../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
- console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
+ console.log('%c 寰愬伐姹変簯 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;');
$(function () {
if ("" === localStorage.getItem('token')) {
top.location.href = baseUrl + "/login";
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 1cbd22c..d5e6dd2 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>涓壃 鈹� login of zoneyung wms</title>
+ <title>寰愬伐姹変簯 鈹� login of zoneyung wms</title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
<meta name="description" content="study of Instancing with three.js">
<meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">
--
Gitblit v1.9.1