From 060f0e7a7cee54449577b237399521abcfeb246e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 23 八月 2023 15:23:52 +0800
Subject: [PATCH] U8接口相关功能
---
src/main/java/com/zy/common/service/AgvCommonService.java | 46 +++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 14 +++
src/main/webapp/views/home/map_edit.html | 87 +++++++++++++++++++++
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/java/com/zy/asrs/entity/param/MatInfoParam.java | 73 ++++++++++++++++++
5 files changed, 221 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f689107..3b752dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -233,6 +233,20 @@
}
}
+ @PostMapping("/mat/v1")
+ public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return R.ok();
+ }
+
+
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
diff --git a/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java b/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java
new file mode 100644
index 0000000..b95bb5c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/MatInfoParam.java
@@ -0,0 +1,73 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * 瀛樿揣妗ｆ鍚屾 u8
+ */
+@Data
+public class MatInfoParam {
+
+ /*
+ 瀛樿揣缂栫爜
+ */
+ private String cinvcode;
+
+ /*
+ 瀛樿揣鍚嶇О
+ */
+ private String cinvname;
+
+ /*
+ 瑙勬牸鍨嬪彿
+ */
+ private String cInvStd;
+
+ /*
+ 瀛樿揣鍒嗙被缂栫爜
+ */
+ private String cinvccode;
+
+ /*
+ 瀛樿揣鍒嗙被鍚嶇О
+ */
+ private String cInvCName;
+
+ /*
+ 璁￠噺鍗曚綅
+ */
+ private String cComUnitName;
+
+ /*
+ 杩涢」绋�
+ */
+ private double iImpTaxRate;
+
+ /*
+ 閿�椤圭◣
+ */
+ private double iTaxRate;
+
+ /*
+ 鍚敤鏃ユ湡
+ */
+ private Date dSDate;
+
+ /*
+ 寤烘。浜�
+ */
+ private String cCreatePerson;
+
+ /*
+ 寤烘。鏃ユ湡
+ */
+ private Date dInvCreateDatetime;
+
+ /*
+ 閫氱敤鍨嬪彿
+ */
+ private String cinvdefine4;
+}
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 579de34..1f21122 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -27,6 +27,8 @@
private AgvLocRuleService agvLocRuleService;
@Autowired
private AgvLocMastService agvLocMastService;
+ @Autowired
+ private MatService matService;
public int getWorkNo(Integer wrkMk) {
AgvWrkLastno wrkLastno = agvWrkLastnoService.selectById(wrkMk);
@@ -85,6 +87,15 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
//return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
+
+ //鏍规嵁鐗╂枡棰戠巼鎼滅储搴撲綅锛岄鐜囬珮鍒欐悳绱㈢缂撳瓨璐ф灦鏈�杩戝簱浣嶏紝棰戠巼浣庡垯鎼滅储鏈�杩滃簱浣�
+ Mat mat = matService.selectByMatnr(agvWaitPakinList.get(0).getMatnr());
+ if(true){
+
+ }else {
+
+ }
+
//
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
// locMast = getLocNoStep4(staDescId, locTypeDto);
@@ -141,12 +152,45 @@
/*
闈犺繎鎽嗘斁瑙勫垯
*/
-
private AgvLocMast getLocByProximityRule(){
//to do
return null;
}
+ /*
+ 鏍规嵁鐗╂枡棰戠巼鏌ユ壘
+ */
+ private AgvLocMast getLocByFre(int fre, int floor){
+ if(floor == 1){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("bay1"));
+ }
+ }
+ if(floor == 3){
+ if(fre == 1){
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1",false));
+ }else{
+ return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
+ .eq("floor",floor)
+ .eq("loc_sts","O")
+ .orderBy("row1"));
+ }
+ }
+
+ throw new CoolException("鎼滅储搴撲綅鏃讹紝妤煎眰鍑洪敊銆�");
+ }
+
//闅忔満鍙栦竴涓揣浣�
private AgvLocMast getLocNoRule(int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b2a4261..ed76694 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -144,6 +144,8 @@
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
+ // 鏍规嵁鐗╂枡棰戠巼鏌ヨ搴撲綅
+
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
diff --git a/src/main/webapp/views/home/map_edit.html b/src/main/webapp/views/home/map_edit.html
index 51917d7..d042949 100644
--- a/src/main/webapp/views/home/map_edit.html
+++ b/src/main/webapp/views/home/map_edit.html
@@ -234,6 +234,93 @@
})
continue
}
+
+ if(j == 2 || j==5 || j==8 || j==11 || j==13 || j==16 || j== 18 || j== 21 || j== 24 || j== 27 || j== 29 || j== 32 ||
+ j== 35 || j== 38 || j== 41 || j== 44 || j== 47 || j== 50){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+ if(i==25 || i==58){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+
+ if((j == 1 || j==3) && i <= 24){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+
+ if(j == 4 && i <= 10){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+
+ if((j==40 || j== 42) && i <= 37){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+
+ if( j >= 43 && i <= 58){
+ x.push({
+ value: -1,
+ data: '',
+ top: 1000,
+ bottom: 1000,
+ left: 1000,
+ right: 1000,
+ x: i,
+ y: j
+ })
+ continue
+ }
+
+
+
// x.push(0)
x.push({
value: 0,
--
Gitblit v1.9.1