Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
QisdaNew
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 4cbb9474
由
sunke
编写于
2023-03-21 11:01:58 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
接口地址由
http://10.85.17.233改为http://10.85.71.25:8080
1 个父辈
ea2473f1
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
14 行增加
和
14 行删除
myproject/src/main/java/com/myproject/util/QisdaApi.java
myproject/src/main/webapp/decorators/metro.jsp
myproject/storageManager.iml
myproject/src/main/java/com/myproject/util/QisdaApi.java
查看文件 @
4cbb947
...
@@ -91,7 +91,7 @@ public class QisdaApi {
...
@@ -91,7 +91,7 @@ public class QisdaApi {
* 获取库存进行比对
* 获取库存进行比对
*/
*/
public
static
Map
<
String
,
DiffInfo
>
getInventory
(
String
area
)
throws
ApiException
{
public
static
Map
<
String
,
DiffInfo
>
getInventory
(
String
area
)
throws
ApiException
{
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMIStcok"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMIStcok"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"area"
,
area
);
paramMap
.
put
(
"area"
,
area
);
...
@@ -141,7 +141,7 @@ public class QisdaApi {
...
@@ -141,7 +141,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMILocationOutFeedback"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMILocationOutFeedback"
;
List
<
Map
<
String
,
Object
>>
materialInfoList
=
new
ArrayList
<>();
List
<
Map
<
String
,
Object
>>
materialInfoList
=
new
ArrayList
<>();
for
(
OutItem
outItem
:
outItemList
)
{
for
(
OutItem
outItem
:
outItemList
)
{
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
...
@@ -266,7 +266,7 @@ public class QisdaApi {
...
@@ -266,7 +266,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMIMateriaReceiveJudge"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMIMateriaReceiveJudge"
;
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
String
dnOrFacility
=
dnInfo
.
getDnNo
();
String
dnOrFacility
=
dnInfo
.
getDnNo
();
...
@@ -323,7 +323,7 @@ public class QisdaApi {
...
@@ -323,7 +323,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
barcode
;
return
barcode
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMILocationInCheck"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMILocationInCheck"
;
String
reelid
=
barcode
.
getBarcode
();
String
reelid
=
barcode
.
getBarcode
();
String
partNum
=
barcode
.
getPartNumber
();
String
partNum
=
barcode
.
getPartNumber
();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
...
@@ -426,7 +426,7 @@ public class QisdaApi {
...
@@ -426,7 +426,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMILocationIn"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMILocationIn"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"reelID"
,
reelID
);
paramMap
.
put
(
"reelID"
,
reelID
);
paramMap
.
put
(
"location"
,
location
);
paramMap
.
put
(
"location"
,
location
);
...
@@ -460,7 +460,7 @@ public class QisdaApi {
...
@@ -460,7 +460,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMIMateriaReceive"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMIMateriaReceive"
;
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
materialInfoMap
.
put
(
"dnOrFacility"
,
barcode
.
getAppendInfo
().
getDnOrFacility
());
//DN单号或者是厂别
materialInfoMap
.
put
(
"dnOrFacility"
,
barcode
.
getAppendInfo
().
getDnOrFacility
());
//DN单号或者是厂别
...
@@ -513,7 +513,7 @@ public class QisdaApi {
...
@@ -513,7 +513,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMILocationOut"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMILocationOut"
;
String
materialInfo
=
JsonUtil
.
toJsonStr
(
materialInfoMap
);
String
materialInfo
=
JsonUtil
.
toJsonStr
(
materialInfoMap
);
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
...
@@ -549,7 +549,7 @@ public class QisdaApi {
...
@@ -549,7 +549,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/VMIMateriaRecAss"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/VMIMateriaRecAss"
;
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
materialInfoMap
=
new
HashMap
<
String
,
Object
>();
AppendInfo
appendInfo
=
task
.
getAppendInfo
();
AppendInfo
appendInfo
=
task
.
getAppendInfo
();
materialInfoMap
.
put
(
"action"
,
appendInfo
.
getAction
());
materialInfoMap
.
put
(
"action"
,
appendInfo
.
getAction
());
...
@@ -621,7 +621,7 @@ public class QisdaApi {
...
@@ -621,7 +621,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
vdPartNum
;
return
vdPartNum
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/PartNoMapping"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/PartNoMapping"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"vdPartNum"
,
vdPartNum
);
paramMap
.
put
(
"vdPartNum"
,
vdPartNum
);
log
.
info
(
"从Qisda获取料号转换:vdPartNum="
+
vdPartNum
);
log
.
info
(
"从Qisda获取料号转换:vdPartNum="
+
vdPartNum
);
...
@@ -649,7 +649,7 @@ public class QisdaApi {
...
@@ -649,7 +649,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
null
;
return
null
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/PartNoRule"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/PartNoRule"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"partNum"
,
partNum
);
paramMap
.
put
(
"partNum"
,
partNum
);
paramMap
.
put
(
"vendorCode"
,
vendorCode
);
paramMap
.
put
(
"vendorCode"
,
vendorCode
);
...
@@ -681,7 +681,7 @@ public class QisdaApi {
...
@@ -681,7 +681,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
;
return
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/ClearStockBy"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/ClearStockBy"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"location"
,
posName
);
paramMap
.
put
(
"location"
,
posName
);
paramMap
.
put
(
"userName"
,
USER_NAME
);
paramMap
.
put
(
"userName"
,
USER_NAME
);
...
@@ -706,7 +706,7 @@ public class QisdaApi {
...
@@ -706,7 +706,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
""
;
return
""
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/GetSerialDataNew"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/GetSerialDataNew"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"line"
,
line
);
paramMap
.
put
(
"line"
,
line
);
paramMap
.
put
(
"hserial"
,
hserial
);
paramMap
.
put
(
"hserial"
,
hserial
);
...
@@ -739,7 +739,7 @@ public class QisdaApi {
...
@@ -739,7 +739,7 @@ public class QisdaApi {
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
log
.
info
(
"程序调试阶段,暂不处理,调试完成后更改PRO"
);
return
""
;
return
""
;
}
}
String
url
=
"http://10.85.
17.233
/ESMTCommonInterface/CommonService.asmx/UpdateBatchRefillMark"
;
String
url
=
"http://10.85.
71.25:8080
/ESMTCommonInterface/CommonService.asmx/UpdateBatchRefillMark"
;
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
Map
<
String
,
Object
>
paramMap
=
new
HashMap
<
String
,
Object
>();
paramMap
.
put
(
"soseq"
,
soseq
);
paramMap
.
put
(
"soseq"
,
soseq
);
try
{
try
{
...
...
myproject/src/main/webapp/decorators/metro.jsp
查看文件 @
4cbb947
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
<div
class=
"page-footer-inner"
>
<div
class=
"page-footer-inner"
>
2016
©
<a
href=
"${ctx}/updateHistory.html"
>
SMD BOX
</a>
2016
©
<a
href=
"${ctx}/updateHistory.html"
>
SMD BOX
</a>
</div>
</div>
<span
class=
"right"
style=
"color: #a3a3a3;"
>
Version: V20230
20810
</span>
<span
class=
"right"
style=
"color: #a3a3a3;"
>
Version: V20230
31714
</span>
<div
class=
"scroll-to-top"
>
<div
class=
"scroll-to-top"
>
<i
class=
"icon-arrow-up"
></i>
<i
class=
"icon-arrow-up"
></i>
</div>
</div>
...
...
myproject/storageManager.iml
deleted
100644 → 0
查看文件 @
ea2473f
此文件的差异被折叠,
点击展开。
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论