姚提交1

src/main/java/adapterContext.xml

@@ -53,7 +53,7 @@
 	<bean id="autoAutoBigTask" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
 		<property name="targetObject" ref="itemJobLauncher"/>
 		<property name="targetMethod" value="DefaultAutoBigTask"/>
-<!-- 		<property name="concurrent" value="false" /> -->
+		<property name="concurrent" value="false" />
 	</bean>
 	<bean id="autoAutoBigTaskTrigger"  class="org.springframework.scheduling.quartz.CronTriggerBean">
         <property name="jobDetail" ref="autoAutoBigTask"/>

src/main/java/com/dev/swms/server/model/inventory/AgvTask.java

@@ -533,12 +533,18 @@ public class AgvTask extends VersionalEntity {
 //		jsonObject.put("agvCode", agvTask.getAgvCode());
 		jsonObject.put("agvEndPoint", agvTask.getAgvEndPoint());
 		jsonObject.put("agvType", agvTask.getAgvType());
+		if (agvTask.getType().equals("AGV上料")) {
+			jsonObject.put("jobPriorityType", 0);
+			jsonObject.put("jobPriority", 1);
+		}else {
 		if(agvTask.getJobPriorityType().equals("1")) {
 			jsonObject.put("jobPriority", 999);
 		}else {
 			jsonObject.put("jobPriority", agvTask.getJobPriority());
 		}
 		jsonObject.put("jobPriorityType", agvTask.getJobPriorityType());
+		}
+		
 		jsonObject.put("letDownFlag", agvTask.getLetDownFlag());
 		jsonObject.put("needOperation", agvTask.getNeedOperation());
 		jsonObject.put("robotJobId", agvTask.getRobotJobId());

src/main/java/com/dev/swms/server/service/base/pojo/DefaultAgvTaskManager.java

@@ -2280,7 +2280,7 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
 	//agv任务超过时长，加急
 	public void urgentAgvTask(List<Long> ids) {
 		Long lg=(new Date()).getTime();
-		logger.error(ids.toString()+"---OPEN--jiaji11111----"+lg);
+		logger.error("---OPEN--jiaji11111----"+lg);
 		if(ids==null||ids.size()==0) {
 		String hql=" select t.agvTask.id from Task t where t.waveDoc.id is not null and t.waveDoc.longtiem>0  "
 				+ " and DATEDIFF(MINUTE,t.dateBill1,GETDATE())>=(t.waveDoc.longtiem*60)"
@@ -2297,7 +2297,7 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
 		}
 		Long lg2=(new Date()).getTime();
 		Long lg3=lg2-lg;
-		logger.error(ids.toString()+"--END---jiaji2222----"+lg3);
+		logger.error("--END---jiaji2222----"+lg3);
 	}
 	//加急接口
 	public void updateUrgentAgvTask(List<Long> ids) {

src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java

@@ -1740,7 +1740,15 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 					List<Item>	items=this.commonDao.findByQuery("from Item it where it.code='"+itemCode+"' ");
 					if(items.size()>0) {
 						Item ietm=items.get(0);
-						if(ietm.isBeMarkWeight()) {
+						boolean benmar=ietm.isBeMarkWeight();//序列号管理
+						String hqlitem=" from MaterialFactory p where p.item.id="+ietm.getId()+
+								" and p.planCode='"+WERKS.trim()+"' ";
+						List<MaterialFactory> itempalns=commonDao.findByQuery(hqlitem);
+						if(itempalns.size()>0) {
+							MaterialFactory md=itempalns.get(0);
+							benmar=md.isBeMarkWeight();
+						}
+						if(benmar) {
 							if(strBill2==null||strBill2.length()==0) {
 								code="205";
 								hs="0";
@@ -1769,6 +1777,16 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 								continue;
 							}
 						}
+					}else {
+//						JSONArray arrayItem=new JSONArray();
+						JSONObject objectItem1=new JSONObject();
+						objectItem1.put("sourceId", sourceId);
+						objectItem1.put("lineNo", lineNo);
+						objectItem1.put("itemCode", itemCode);
+						objectItem1.put("errorcode", "205");
+						objectItem1.put("errordescr", "料号不存在!");
+						resultInfo.add(objectItem1);
+						continue;
 					}
 					
 				}
@@ -3230,19 +3248,13 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 					
 					commonDao.store(libraryTask);
 					
-					//LED显示信息
+
-//					libraryTask.setMes("堆垛机搬运中");
-//					msg=libraryTask.getId()+"";
-//					interfaceReqManager.receiveLEDinfo(libraryTask);
 				}else if (TaskStatus.equals(LibraryTaskType.ddwc)) {
 					libraryTask.setStatus(STATUS.ATWORK);//输送线上
 					libraryTask.setRelatedBill3(TaskStatus);
 					libraryTask.setArrivalDate(new Date());
 					commonDao.store(libraryTask);
-					//LED显示信息
+
-//					libraryTask.setMes("已放输送线上");
-//					msg=libraryTask.getId()+"";
-//					interfaceReqManager.receiveLEDinfo(libraryTask);
 				}else if (TaskStatus.equals(LibraryTaskType.rwwc)) {
 					//LED显示信息,//完成
 					String str="";
@@ -3267,13 +3279,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 					commonDao.store(libraryTask);
 					String str="";
 					if(libraryTask.getType().equals("2")) {
-//						if(libraryTask.getClassification().equals("拣货")) {
 						str=libraryTask.getBarcode()+"托盘，<br>已到达缓存位,可以进站";
-//						}else if(libraryTask.getClassification().equals("盘点")) {
-//							str=libraryTask.getBarcode()+"托盘，已到达"+libraryTask.getToCellCode()+",可以盘点";
-//							}else{
-//							
-//						}
 					}
 					//LED显示信息
 					libraryTask.setMes(str);

src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java

@@ -1278,14 +1278,14 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
 				      + " left join zone z on z.id=mdd.warehouse_Area_ID_SRC "
 				      + " where 1=1 and mdd.PLAN_QUANTITY_MU-mdd.MOVE_QUANTITY>0";
 					  if(itemCode!=null && itemCode.length()>0){
-							sql+=" and ((item.code) like ('"+ itemCode + "%') )";
+							sql+=" and item.code = '"+ itemCode + "'";
 						}
 					  
-					   if(asn_code!=null && asn_code.length()>0){
+//					   if(asn_code!=null && asn_code.length()>0){
-							sql+=" and ((md.RELATEBILLCODE) like ('"+ asn_code + "%') )";
+//							sql+=" and md.RELATEBILLCODE = "+ asn_code + "' ";
-						}
+//						}
 					   if(barCode!=null&&barCode.length()>0){
-						   sql+=" and (s.LP like '"+ barCode + "%' )";
+						   sql+=" and s.LP = '"+ barCode + "' ";
 					   }else {
 						   msg="请扫描容器！";
 						   resultJson.put("status", status);
@@ -6743,7 +6743,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
 		
 		if(result.size()>0) {
 			String id=result.get(0);
-			if(id!=null&&!id.equals("")) {
+			if(id!=null&&!id.equals("")&&!id.equals("\"null\"")) {
 			JSONObject data1 = new JSONObject();
 			Task t=commonDao.load(Task.class, Long.parseLong(id));
 			PickTicketDetail ptd=commonDao.load(PickTicketDetail.class, t.getPickTicketDetail().getId());
@@ -8359,6 +8359,9 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
 //		try {
 			JSONObject obj=new JSONObject();
 			PrintTask pt =  commonDao.load(PrintTask.class, pid);
+			if(qty>100) {
+				msg="打印张数不能超过100";
+			}else {
 			if(pt!=null){
 				PrintTask newpt=EntityFactory.getEntity(PrintTask.class);
 				newpt.setType(pt.getType());
@@ -8388,6 +8391,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
 			}else{
 				msg="无相关记录！";
 			}
+			}
 			/*} catch (Exception e) {
 			msg=e.getMessage();
 		}*/

src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java

@@ -2366,7 +2366,6 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 						hqlmaveloc=hqlmaveloc+"  ELSE  9999 " + 
 								"    END ASC " ;
 						lcs=lcs.substring(0, lcs.length()-1);
-						
 						hql2=hql2+","+hqlmaveloc;
 					}
 					}
@@ -2402,6 +2401,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 							String locsx="";//工单发料,LOC的优先级
 							if(bts.size()>0) {
 								StringBuffer sb = new StringBuffer();
+							
 								locsx=" CASE i.itemKey.lotInfo.propC2 ";
 								for(int i=0;i<=bts.size()-1;i++){
 									BillTypeConfig bt=bts.get(i);
@@ -2432,7 +2432,6 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 							hql1+=" and i.itemKey.lotInfo.propC2='"+ptd.getNewLotInfo().getPropC2()+"'";
 							}
 						}
-			
 						//料号有效期管理
 						if(ptd.getItem().getIsBOM()) {
 							hql1+=" and CONVERT(varchar(100), i.itemKey.lotInfo.propD2, 23)>='"+DateUtil.formatDateYMDToStr(new Date())+"' ";
@@ -3291,7 +3290,8 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 				}else {
 					
 				}
-				String hql2=" order by i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,i.statuss desc,i.storageDate,i.quantity";
+				//排序
+				String hql2=" order by i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1 ";
 				//排序
 				String lcs = new String();
 				if(pt.getBillType()!=null&&pt.getBillType().getName().indexOf("工单")>=0
@@ -3308,8 +3308,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 					hqlmaveloc=hqlmaveloc+"  ELSE  99 " + 
 							"    END ASC " ;
 					lcs=lcs.substring(0, lcs.length()-1);
-				
+					hql2=hql2+","+hqlmaveloc;
-					hql2=" order by i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,"+hqlmaveloc+",i.statuss desc,i.storageDate,i.quantity";
 				}
 				}
 				
@@ -3342,20 +3341,30 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 							bsql+=" and b.plantCode='"+ptd.getNewLotInfo().getPropC9()+"'";
 						}
 					List<BillTypeConfig> bts=commonDao.findByQuery(bsql);
+					String locsx="";//工单发料,LOC的优先级
 					if(bts.size()>0) {
 						StringBuffer sb = new StringBuffer();
+						locsx=" CASE i.itemKey.lotInfo.propC2 ";
+						
 						for(int y1=0;y1<=bts.size()-1;y1++){
 							BillTypeConfig bt=bts.get(y1);
 				            if(y1<bts.size()-1){
+				            	locsx=locsx+" WHEN '"+bt.getCode()+"' THEN  "+bt.getPrioritize();
 				                sb.append("'"+bt.getCode() + "', ");
 				            }else {
+				            	locsx=locsx+" WHEN '"+bt.getCode()+"' THEN  "+bt.getPrioritize() ;
 				                sb.append("'"+bt.getCode()+"' ");
 				            }
 				        }
 						if(lcs!=null&&lcs.length()>0) {
 							 sb.append(","+lcs);
 						}
+						locsx=locsx+"  ELSE  1 " + 
+								"    END DESC " ;
+						
 						hql1+=" and i.itemKey.lotInfo.propC2 in("+sb.toString()+") ";
+						
+						hql2=hql2+", "+locsx;
 					}else {
 						if(ptd.getNewLotInfo()!=null&&ptd.getNewLotInfo().getPropC2()!=null&&ptd.getNewLotInfo().getPropC2().length()>0) {
 							hql1+=" and i.itemKey.lotInfo.propC2='"+ptd.getNewLotInfo().getPropC2()+"'";
@@ -3375,6 +3384,8 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 				if(ptd.getItem().getIsBOM()) {
 					hql1+=" and CONVERT(varchar(100), i.itemKey.lotInfo.propD2, 23)>='"+DateUtil.formatDateYMDToStr(new Date())+"'";
 				}
+				
+				hql2=hql2+",i.statuss desc,i.storageDate,i.quantity";
 				//
 				List<Inventory> Inventorys = commonDao.findByQuery(
 						hql1+hql2,new String[] { "id" },new Object[] { ptd.getItem().getId() });

src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java

@@ -4598,7 +4598,7 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
 				JSONObject obj=new JSONObject();
 				obj.put("itemName", item.getName());
 				obj.put("unit", item.getUnit());
-				obj.put("quantity", ad.getExpectedQtyOfMasterUnit());
+				obj.put("quantity", ad.getExpectedQuantity());
 				obj.put("taskCode", taskCode);
 				obj.put("qrcode", qrcode);
 				obj.put("barCode", ad.getStrBill2()==null?"":ad.getStrBill2());

src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java

@@ -7273,6 +7273,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 	}
 
 	public void updatePrintTask(List<Long> ids, Long pId, int nuber,String print) {
+		if(nuber>100) {
+			throw new BusinessException("打印张数不能大于100");
+		}
 		for(Long taskId:ids) {
 			Task t = commonDao.load(Task.class, taskId);
 			if (t != null) {
@@ -10532,9 +10535,10 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 			String itemcode="";//子任务号
 			String itemNuber="";//行号
 			String [] str=null;
-			if(nuber<=0) {
+			if(nuber<=0||nuber>100) {
-				throw new BusinessException("打印张数必须大于0"); 
+				throw new BusinessException("打印张数1-100之间"); 
 			}
+			
 			if(barCode.indexOf("/")!=-1){
 				str=barCode.split("/");
 				if(str.length>=2){

src/main/java/com/dev/swms/server/web/servlet/InventoryServlet.java

@@ -4,6 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -104,10 +105,25 @@ public class InventoryServlet extends HttpServlet{
 				String be_urgent = json.has("be_urgent")?json.getString("be_urgent"):"";//是否加急
 				
 				AgvTaskManager agvtask = (AgvTaskManager) ac.getBean("agvTaskManager");
-				String [] ids=	invIds.split(",");
+				if(invIds!=null&&invIds.length()>0) {
-				resultObject.put("returnCode", 1);
+				String [] stsList=invIds.split(",");
-	        	resultObject.put("returnMsg","成功");
+				List<Long> invidList=new ArrayList<Long>();
-	        	resultOutput=resultObject.toString();
+				for(String strid:stsList) {
+					invidList.add(Long.parseLong(strid));
+				}
+				Long pid=Long.parseLong(gzz_id);
+				boolean jsa=false;
+				if(be_urgent!=null&&(be_urgent.equals("TRUE")||be_urgent.equals("true"))) {
+					jsa=true;
+				}
+				if(invidList.size()>0) {
+					agvtask.callInventory(invidList, pid, jsa, remarks);
+					resultObject.put("returnCode", 1);
+		        	resultObject.put("returnMsg","成功");
+		        	resultOutput=resultObject.toString();
+				}
+				
+				}
 	        }
         }else{ 
         	resultObject.put("returnCode", -1);

src/main/java/com/dev/swms/server/web/servlet/PrintServlet.java

@@ -138,7 +138,7 @@ private static Logger logger = Logger.getLogger(PrintServlet.class);
 			String printName =json.has("printName")?json.getString("printName"):"";
 			resultJson=this.reprintPrintTask(ptId,barCodes, quantity,workerId,commonDao);
 		}else if("reprintPrintItemCode".equals(methodType)){
-			//补打标签
+			//料号标签
 			String barCodes =json.has("barCodes")?json.getString("barCodes"):"";
 			long ptId = json.has("ptId")?Long.parseLong(json.getString("ptId").equals("")?"0":json.getString("ptId")):0;
 			long quantity = json.has("quantity")?Long.parseLong(json.getString("quantity").equals("")?"0":json.getString("quantity")):0;

src/test/yao/2025.sql

@@ -431,7 +431,7 @@ PRINT '所有表统计信息更新完成'
 ALTER TABLE   Bill_Type_Config    add prioritize  int  NULL;
 
 GO
-UPDATE Bill_Type_Config SET prioritize =0 WHERE prioritize IS NULL;
+UPDATE Bill_Type_Config SET prioritize =1 WHERE prioritize IS NULL;
 
 
 

src/webapp/WEB-INF/classes/config/origen/receiving/maintainAGVTASKPage.xml

@@ -35,15 +35,10 @@
             <text id="agv.code" title="盘点号" row="5" col="1" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-             <!-- <dateRanger id="agv.createTime" title="订单日期" row="4" col="1"  span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/>
-             <text id="agv.containerCode" title="料箱号" row="5" col="1" readOnly="false"
-					required="false" reserve="false" forceOverride="false" inVisible="false"
-					trimSpace="false" />
 			<booleanList id="agv.beIssue" title="是否下发" row="5" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-            <checkbox id="ordersAll" title="ordersAll" row="6" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
+<!-- 			<checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="false" -->
-			<booleanList id="agv.beIssue" title="是否下发" row="5" col="2" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
+<!-- 					span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" /> -->
-			<checkbox id="ordersAll" title="ordersAll" row="6" col="1" defaultValue="false"
+			<booleanList id="ordersAll" title="ordersAll" row="6" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
-					span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" />
 			<text id="agv.classification" title="业务" row="6" col="2" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
@@ -112,17 +107,17 @@
  from AgvTask  agv
  where 1=1 
  and ( agv.status in ('NONCHECKED','ATCALL','ATWAIT','ATWORK','ATPICK','LISTING_FAILED') 
- or  ( /~ordersAll: {ordersAll} = true~/ )) 
+    /~ordersAll: or 1=1 ~/ ) 
- /~agv.type: AND (agv.type) like ({agv.type}) ~/
+ /~agv.type: AND agv.type like {agv.type} ~/
- /~agv.errorMsg: AND agv.errorMessage like ({agv.errorMsg}) ~/
+ /~agv.errorMsg: AND agv.errorMessage like {agv.errorMsg} ~/
  /~agv.code: AND agv.code like {agv.code} ~/
- /~agv.robotJobId: and agv.robotJobId  like ({agv.robotJobId}) ~/
+ /~agv.robotJobId: and agv.robotJobId  like {agv.robotJobId} ~/
  /~agv.status: and agv.status = {agv.status} ~/
  /~agv.targetArea: and CHARINDEX({agv.targetArea}, agv.targetArea) > 0   ~/
- /~agv.workMode: and agv.workMode like ({agv.workMode}) ~/
+ /~agv.workMode: and agv.workMode like {agv.workMode} ~/
  /~agv.containerCode: and agv.containerCode  like ({agv.containerCode}) ~/
  /~agv.beIssue: and agv.beIssue = {agv.beIssue} ~/
- /~agv.classification: and agv.classification like ({agv.classification}) ~/
+ /~agv.classification: and agv.classification like {agv.classification} ~/
  and (1=1 
  /~beginDate: AND CONVERT(varchar(100), agv.createTime, 23) = {beginDate} ~/
  /~endDate: or (CONVERT(varchar(100), agv.createTime, 23)>= {beginDate} and CONVERT(varchar(100), agv.createTime, 23)<= {endDate})  ~/

src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml

@@ -60,17 +60,11 @@
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					inVisible="false" showTime="false" manualEditable="true"
 					defaultCurrentDate="false" />
-				<!-- <dateRanger id="ad.createDate" title="创建时间" row="0" col="3"  span="2" 
+	
-				readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" 
-				showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/> -->
-<!-- 				<booleanList id="beInput" title="是否整理完成" row="4" col="1" span="1" width="120" readOnly="false"  -->
-<!-- 				required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
 				<text id="asn.code" title="SAP接口号" row="3" col="3" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-<!-- 				<text id="asn.strBill1" title="加急标记" row="4" col="1" readOnly="false" -->
+
-<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-<!-- 					trimSpace="false" /> -->
 				<booleanList id="ad.strBill11" title="加急标记" row="4" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
 					
 				<checkbox id="ordersAll" title="ordersAll" row="4" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
@@ -117,10 +111,11 @@
  left join ad.dock as dock
  where   (ad.strBill=true or ad.bequality!=true) 
  and (ad.beInput!=1 or ad.expectedQuantity>ad.receivedQuantity or ( /~ordersAll: {ordersAll} = true~/ ))
- and (1=1
+ 
  /~asn.code: AND upper(asn.code) like upper({asn.code}) ~/
  /~item.code: AND upper(item.code) like upper({item.code}) ~/
  /~barcode: AND (item.barcode) like ({barcode}) ~/
+
  /~ad.strBill11: AND ((ad.strBill11='1' and {ad.strBill11}=true) or ( ad.strBill11 is null and {ad.strBill11}=false) )~/
  /~dock: AND upper(dock.code) like upper({dock}) ~/
  /~name: AND upper(item.name) like upper({name}) ~/
@@ -137,7 +132,7 @@
  and (1=1
  /~beginDate: AND CONVERT(varchar(100), asn.orderDate, 23) = {beginDate} ~/
  /~endDate: or (CONVERT(varchar(100), asn.orderDate, 23)>= {beginDate} and CONVERT(varchar(100), asn.orderDate, 23)<= {endDate})  ~/)
- ) and (1=1
+  and (1=1
  /~beginDate1: AND CONVERT(varchar(100), ad.receiveDate, 23) >= {beginDate1} ~/
  /~endDate1: or CONVERT(varchar(100), ad.receiveDate, 23)>= {beginDate1} and CONVERT(varchar(100), ad.receiveDate, 23)<= {endDate1} ~/
  )

src/webapp/WEB-INF/classes/config/origen/shipping/maintainOutStorageListPage.xml

@@ -92,7 +92,7 @@
  pickTicketDetail.pickedQuantity,
  pickTicketDetail.newLotInfo.propC2,
  pickTicketDetail.newLotInfo.propC9,
- pickTicket.driverName,
+ pickTicketDetail.locType,
  pickTicketDetail.createDate,
  pickTicketDetail.createDate,
  pickTicketDetail.pickAllDate,
@@ -136,7 +136,7 @@
  order by pickTicket.orderDate ,pickTicket.code desc,pickTicketDetail.id desc ]]></datasource>
 		<columns>
 			<column id="pickTicket.id" title="pickTicket" visible="false" />
-			<column id="pickTicket.sourceType" width="80" title="出库类型"
+			<column id="pickTicket.sourceType" width="40" title="出库类型"
 				visible="true" horizonAlign="center" />
 			<column id="pickTicket.code" width="100" title="预留号" visible="true" horizonAlign="center"  format="picktickCodeFormatter" />
 			<column id="pickTicket.orderDate1" width="100" title="要料日期"
@@ -147,31 +147,33 @@
 <!-- 					visible="true" horizonAlign="center" /> -->
 			<column id="pickTicketDetail.SOI" title="优先级" width="60"
 					visible="false" horizonAlign="center" />
-			<column id="pickTicket.billType.name" width="100" title="billType"
+			<column id="pickTicket.billType.name" width="70" title="billType"
 				visible="true" horizonAlign="center" verticalAlign="middle" />
 			<column id="pickTicket.status" width="70" title="pickTicket.status"
 				visible="true" horizonAlign="center" dataType="enum" format="enumFormat"
 				formatParam="PickTicketStatus" />
 			<column id="pickTicketDetail.item.code" title="料号" width="140"
 				visible="true" horizonAlign="center" />
-			<column id="pickTicketDetail.item.name" title="物料名称" width="140"
+			<column id="pickTicketDetail.item.name" title="物料名称" width="110"
 				visible="true" horizonAlign="center" />
 			<column id="pickTicketDetail.orderQuantity" width="80"
 				title="pickTicketDetail.orderQuantity" visible="true" horizonAlign="center" />
-			<column id="pickTicketDetail.allocatedQuantity" width="90"
+			<column id="pickTicketDetail.allocatedQuantity" width="70"
 				title="pickTicketDetail.allocatedQuantity" visible="true"
 				horizonAlign="center" />
-			<column id="pickTicketDetail.pickedQuantity" width="90"
+			<column id="pickTicketDetail.pickedQuantity" width="70"
 				title="pickTicketDetail.pickedQuantity" visible="true"
 				horizonAlign="center" verticalAlign="middle" />
-			<column id="pickTicketDetail.newLotInfo.propC2" width="90"
+			<column id="pickTicketDetail.newLotInfo.propC2" width="70"
-				title="LOC" visible="true"
+				title="发出LOC" visible="true"
 				horizonAlign="center" verticalAlign="middle" />
-			<column id="pickTicketDetail.newLotInfo.propC9" width="90"
+			<column id="pickTicketDetail.newLotInfo.propC9" width="70"
 				title="工厂" visible="true"
 				horizonAlign="center" verticalAlign="middle" />
-			<column id="pickTicket.driverName" title="相关单号" visible="false"
+			<column id="pickTicketDetail.locType" width="70"
-				horizonAlign="center" />
+				title="接收LOC" visible="true"
+				horizonAlign="center" verticalAlign="middle" />	
+			
 			<column id="pickTicketDetail.createDate1" title="创建日期" visible="true"
 				horizonAlign="center" format="dateFormatter"/>
 			<column id="pickTicketDetail.createDate2" title="创建时间" visible="true"

src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml

@@ -60,8 +60,6 @@
  pickTicket.workerName4,
  pickTicket.deliveryMode,
  pickTicket.shipmentMethod,
- pickTicket.workerName2,
- 
   pickTicket.sourceId,
   pickTicket.userName
  from PickTicket pickTicket
@@ -133,8 +131,6 @@
 				visible="true" horizonAlign="center" />
 			<column id="pickTicket.shipmentMethod" width="140" title="交接位置"
 				visible="true" horizonAlign="center" />		
-				<column id="pickTicket.workerName2" width="40" title="接收LOC"
-				visible="true" horizonAlign="center" />
 			<column id="pickTicket.sourceId" width="150" title="SAP接口号"
 				visible="true" horizonAlign="center" />
 			<column id="pickTicket.userName" width="80" title="操作人"

src/webapp/WEB-INF/classes/hibernate.properties

@@ -29,11 +29,11 @@ ldxt.bz=0
 hibernate.query.substitutions true=1, false=0
 
 hibernate.max_fetch_depth=0
-hibernate.jdbc.fetch_size=50
+hibernate.jdbc.fetch_size=100
-hibernate.jdbc.batch_size=25
+hibernate.jdbc.batch_size=30
 hibernate.cglib.use_reflection_optimizer=true
 hibernate.jdbc.use_scrollable_resultset=true
-hibernate.connection.isolation=4
+hibernate.connection.isolation=2
 hibernate.order_updates=true
 #hibernate.cache.provider_cache=org.hibernate.cache.EhCacheProvider
 hibernate.cache.use_second_level_cache=false