Skip to content

孙克 / SmdBox

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 08bf4777 由 张少辉
选项

1.入库类型修改 

2.同一个料架同时操作问题
1 个父辈 f9cecdb2
内嵌 并排
正在显示 7 个修改的文件 包含 23 行增加 和 205 行删除
myproject/src/main/java/com/myproject/webapp/controller/storage/AccShelfController.java
......@@ -183,11 +183,16 @@ public class AccShelfController extends BaseController {
*/
@RequestMapping("/service/store/accShelf/putInCode")
@ResponseBody
public String putInCode(HttpServletRequest request){
public synchronized String putInCode(HttpServletRequest request){
final String cid = request.getParameter("cid");
String code = request.getParameter("code");
String workOrderNumber = request.getParameter("workOrderNumber");
String checkType = request.getParameter("checkType");
if (Strings.isNullOrEmpty(checkType)){
return "入库类型不能为空";
}
StoragePos lastPutinPos= lastPutinPosMap.get(cid);
Storage storage = dataCache.getStorage(cid);
if(lastPutinPos != null){
......
myproject/src/main/java/com/myproject/webapp/controller/storage/NLPShelfController.java
......@@ -96,6 +96,11 @@ public class NLPShelfController extends BaseController {
String code = request.getParameter("code");
String workOrderNumber = request.getParameter("workOrderNumber");
String checkType = request.getParameter("checkType");
if (Strings.isNullOrEmpty(checkType)){
return "入库类型不能为空";
}
Storage storage = dataCache.getStorage(cid);
Collection<DataLog> queueTasks = taskService.getQueueTasks();
for (DataLog queueTask : queueTasks) {
......
myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java
......@@ -1798,7 +1798,7 @@ public class TaskService implements ITaskService {
params.put("loc",loc);
params.put("warehouseId","SG00001");
params.put("workNo",workOrderNumber);
params.put("storageType","");
params.put("storageType","10");
if (StringUtils.isNotEmpty(checkType)){
if (checkType.contains("中转仓入库")){
params.put("storageType","10");
......@@ -1838,8 +1838,11 @@ public class TaskService implements ITaskService {
params.put("reelId",reelBarcode);
params.put("ri",reelBarcode);
params.put("warehouseId","SG00001");
if (StringUtils.isNotEmpty(workOrderNumber)){
params.put("storageType","");
} else {
params.put("storageType","30");
}
if (StringUtils.isNotEmpty(checkType)) {
if (checkType.contains("发2003")) {
params.put("storageType", "10");
......@@ -1853,7 +1856,7 @@ public class TaskService implements ITaskService {
params.put("workNo",workOrderNumber);
log.info("请求参数为: "+ JSON.serialize(params));
log.info("请求参数为: "+ JSON.serialize(params)+",checkType为:"+checkType);
String result = HttpHelper.get(url,params);
log.info("收到MES ["+ url+"]的关于["+reelBarcode+"]出库通知的反馈信息:"+result);
......
myproject/src/main/webapp/WEB-INF/pages/storage/accShelf.jsp
......@@ -284,9 +284,11 @@
$("#sizeConfirm").modal("hide");
var codeValue = $("#scan-code").attr("placeholder");
var sizeStr = $(this).text();
var checkType = getUrlParam("type") || "${tab_zhongzhuanIn}";
var workOrder = $.trim($("#work-order-input").val());
if(codeValue){
var newCodeStr = "="+sizeStr+"="+codeValue;
$.post("${ctx}/service/store/accShelf/putInCode", {cid: '${show}', code: newCodeStr}, function (data) {
$.post("${ctx}/service/store/accShelf/putInCode", {cid: '${show}', code: newCodeStr,workOrderNumber: workOrder, checkType: checkType}, function (data) {
showMsg(data);
});
}
......
myproject/src/main/webapp/WEB-INF/pages/storage/nlpShelf.jsp
......@@ -284,10 +284,12 @@
$(".psizeBox").click(function(){
$("#sizeConfirm").modal("hide");
var codeValue = $("#scan-code").attr("placeholder");
var checkType = getUrlParam("type") || "${tab_zhongzhuanIn}"; // 添加这一行
var workOrder = $.trim($("#work-order-input").val());
var sizeStr = $(this).text();
if(codeValue){
var newCodeStr = "="+sizeStr+"="+codeValue;
$.post("${ctx}/service/store/nlp/putInCode", {cid: '${show}', code: newCodeStr}, function (data) {
$.post("${ctx}/service/store/nlp/putInCode", {cid: '${show}', code: newCodeStr,workOrderNumber: workOrder, checkType: checkType}, function (data) {
showMsg(data);
});
}
......
myproject/storageManager.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/resources/packaged" relative="WEB-INF/classes" />
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
<root url="file://$MODULE_DIR$/target/classes" relative="WEB-INF/classes" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-ldap:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.ldap:spring-ldap-core:2.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.5" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-jcl:2.1" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.1" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.2.0.Beta1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.27" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.1" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: displaytag:displaytag:1.2" level="project" />
<orderEntry type="library" name="Maven: com.lowagie:itext:2.1.7" level="project" />
<orderEntry type="library" name="Maven: bouncycastle:bcmail-jdk14:138" level="project" />
<orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bctsp-jdk14:1.38" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk14:1.38" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk14:1.38" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.springmodules:spring-modules-validation:0.8" level="project" />
<orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.0" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: rhino:js:1.6R2" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.subethamail:subethasmtp-wiser:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.subethamail:subethasmtp-smtp:1.2" level="project" />
<orderEntry type="library" name="Maven: org.directwebremoting:dwr:2.0.10" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-web:2.0.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: struts-menu:struts-menu:2.4.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
<orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
<orderEntry type="library" name="Maven: sslext:sslext:1.2-0" level="project" />
<orderEntry type="library" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: opensymphony:sitemesh:2.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.tuckey:urlrewritefilter:4.0.3" level="project" />
<orderEntry type="library" name="Maven: ro.isdc.wro4j:wro4j-core:1.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
<orderEntry type="library" name="Maven: org.webjars:jquery-cookie:1.3.1" level="project" />
<orderEntry type="library" name="Maven: org.webjars:bootstrap:3.3.1" level="project" />
<orderEntry type="library" name="Maven: org.webjars:jquery:1.11.1" level="project" />
<orderEntry type="library" name="Maven: org.webjars:bootstrap-datepicker:1.3.1" level="project" />
<orderEntry type="library" name="Maven: org.webjars:bootswatch-spacelab:3.3.1+2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-1.2-api:2.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-web:2.1" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxrs:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.0.1" level="project" />
<orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.1" level="project" />
<orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.0.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.10-b140310.1920" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.10-b140310.1920" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.4.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.4.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.4.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.5" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.3.6.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.5.Final" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-ehcache:4.3.6.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.11" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-search:4.5.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-search-orm:4.5.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-search-engine:4.5.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro:1.7.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-facet:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-search-analyzers:4.5.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.solr:solr-analysis-extras:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-smartcn:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.lucene:lucene-stempel:3.6.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.8.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.12.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.11" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:4.2.0.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.10.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.13" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.2.1" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.9" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.mina:mina-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: org.samba.jcifs:jcifs:1.3.3" level="project" />
</component>
</module>
\ No newline at end of file
storage.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!