拣货表加料号字段

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

@@ -158,8 +158,18 @@ public class Task extends VersionalEntity {
 	private boolean beUnpacking=false;//是否最小包装
 	private String ncrCode;//不良品的NCR号
 	private String smallUnit;//是否一包一个
+	private String itemCode;//料号
 	
 	
+	
+	public String getItemCode() {
+		return itemCode;
+	}
+
+	public void setItemCode(String itemCode) {
+		this.itemCode = itemCode;
+	}
+
 	public String getSmallUnit() {
 		return smallUnit;
 	}

src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml

@@ -176,6 +176,7 @@
 		<property name="beUnpacking" column="BE_UNPACKING" type="boolean" />
 		<property name="ncrCode" column="NCR_CODE" type="string" length="50" />
 		<property name="smallUnit" column="small_Unit" type="string" length="50" />
+		<property name="itemCode" column="item_Code" type="string" length="50" />
 	</class>
 	<!-- <query name="getNotAllPickTasksByWaveDocId"> -->
 	<!-- <![CDATA[ select task from Task task -->

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

@@ -831,7 +831,14 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
 				}else {
 					interfaceReqManager.doWmsReqAgv(ApiURL.eoutAGV,agvTask.yxjAGVJSON(agvTask),agvTask.getRobotJobId());
 				}
+			}else {
+				if(jobPriorityType!=null&&jobPriorityType==1) {
+					if (agvTask.isBeIssue()==true) {
+						interfaceReqManager.doWmsReqAgv(ApiURL.eoutAGV,agvTask.yxjAGVJSON(agvTask),agvTask.getRobotJobId());
+					}
+				}
 			}
+			
 			return agvTask;
 		}
 		return null;

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

@@ -2503,6 +2503,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 								task.setOperator(UserHolder.getUser().getName());
 								task.setStrBill3(UserHolder.getUser().getName());
 							}
+							task.setItemCode(item.getCode());
 							tasks.add(task);
 							commonDao.store(task);
 							
@@ -3067,7 +3068,6 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 					hql1+=" and CONVERT(varchar(100), i.itemKey.lotInfo.propD2, 23)>='"+DateUtil.formatDateYMDToStr(new Date())+"'";
 				}
 				//
-				
 				List<Inventory> Inventorys = commonDao.findByQuery(
 						hql1+hql2,new String[] { "id" },new Object[] { ptd.getItem().getId() });
 				if (Inventorys.size() > 0) {
@@ -3136,6 +3136,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 								task.setOperator(UserHolder.getUser().getName());
 								task.setStrBill3(UserHolder.getUser().getName());
 							}
+							task.setItemCode(item.getCode());
 							commonDao.store(task);
 							tasks.add(task);
 					}

src/main/java/com/dev/swms/server/service/receiving/MoveDocManager.java

@@ -345,4 +345,8 @@ public interface MoveDocManager extends BaseManager {
 	
 	@Transactional
 	void addLibraryTask(List<Long> ids);
+	
+	@Transactional
+	void updateSapStatus(List<Long> ids);
+	
 }

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

@@ -5551,4 +5551,15 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
 					}
 				}	
 				 }
+			
+			
+		public 	void updateSapStatus(List<Long> ids) {
+				for(Long id:ids) {
+					ReceivedRecord rd=commonDao.load(ReceivedRecord.class, id);
+					rd.setSapStatus("1");
+					commonDao.store(rd);
+				}
+			}
+			
+			
 }

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

@@ -2895,6 +2895,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 		task.setWarehouseArea(inventory.getLocation().getZone());
 		task.setBarCode(inventory.getBarCode());
 		task.setSrcLP(inventory.getLocation().getStock());
+		task.setItemCode(item.getCode());
 		commonDao.store(task);
 		
 		return task;
@@ -7129,15 +7130,23 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 				List<Object[]> swListObjects = jdbcManager.getList(sBuffer.toString());
 
 				for (Object[] objects : swListObjects) {
-					String swName = objects[0].toString();
+					String swName = objects[0].toString();//工作站编号
+					//查询工作站有没有其它业务的任务。
+					List<Long> agvTasktypes =  commonDao.findByQuery("select agvTask.id from AgvTask agvTask "
+							+ " where agvTask.beIssue=true "
+							+ " and agvTask.classification not in ('"+SlotType.pickTaks+"') "
+							+ " and agvTask.status in ('ATPICK','ATCALL','ATWAIT','ATWORK') "
+							+ " and agvTask.targetArea like '%"+swName+"%' "
+							);
+					if(agvTasktypes.size()>0) {
+						//有任务直接跳过改工作站任务
+						continue;
+					}
 					int blank = Integer.valueOf(objects[1].toString());
 					List<LocationStorage> lStorages = commonDao
 							.findByQuery(" from LocationStorage ls where  ls.name='" + swName + "'");
 					LocationStorage locationStorage = lStorages.get(0);
 					// 查询波次出库单
-//					List<Integer> waveDocs = commonDao
-//							.findByQuery("select w.id from WaveDoc w where  w.status='PICKUP'");
-//					logger.info("工作站拣货任务下发：" + swName + " 开始分配播种格,剩余" + blank);
 					if (true) {
 						// 查询所有含有task.agvStatus=1(未下发到工作站) 的子工单
 						List<Object> billListObjects = commonDao.findByQuery("select t.billCode  from  "
@@ -7146,7 +7155,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 								+ " order by max(t.pickTicketDetail.SOI) desc,min(t.createTime) ,t.billCode ");
 						
 						String billCode = "";
-//						logger.info("任务数"+billListObjects.size());
 						if (billListObjects.size() > 0) {
 							for (Object obj : billListObjects) {
 								List<Task> taskLists = commonDao
@@ -9792,9 +9800,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 										List<String>	tLocds2=commonDao.findByQuery(taskloc2);
 										 fromaddress=tLocds2.get(0);
 										 //有报错信息，任务不会回传完成标记
-										 if(msg!=null&&msg.length()>0) {
+//										 if(msg!=null&&msg.length()>0) {
-											 jdwz="";
+//											 jdwz="";
-										 }
+//										 }
 										//位置回传 
 										 JSONObject bh=	wmsSapWeizhihuichuang(tids1,fromaddress,dstLoc.getCode(),jdwz);
 										//更新task任务的信息

src/test/yao/2025.sql

@@ -69,3 +69,18 @@ ON [dbo].[TASK] (
 
 
 CREATE CLUSTERED INDEX idx_clust_EmployeeID ON Employees(EmployeeID);
+
+
+-----------更新统计信息
+UPDATE STATISTICS INVENTORY_LOG;
+UPDATE STATISTICS BILL_TYPE;
+UPDATE STATISTICS LOCATION;
+UPDATE STATISTICS ZONE;
+UPDATE STATISTICS ITEM_KEY;
+UPDATE STATISTICS ITEM;
+UPDATE STATISTICS TASK;
+UPDATE STATISTICS INVENTORY;
+
+
+ALTER TABLE   TASK    add item_Code varchar(50) COLLATE Chinese_PRC_CI_AS  NULL;
+GO

src/webapp/WEB-INF/classes/config/origen/putaway/maintainMoveDocbillSapPage.xml

@@ -215,7 +215,7 @@
 		</columns>
 		<buttons>
 		
-			 <commit id="sruk32s" title="WMS2SAP-采购入库任务反馈接口" enableType="multi" invisible="false" confirmMessage="确认是否回传？">
+			 <commit id="sruk32s" title="WMS-SAP重新回传" enableType="multi" invisible="false" confirmMessage="确认是否回传？">
 <!-- 				<enableExpression><![CDATA[(${rd.qualityQty}==0)]]></enableExpression> -->
 				<mappings>
 					<mapping id="ids" className="list" />
@@ -232,7 +232,7 @@
 			<popup id="psrint2313" title="查看异常" enableType="single" invisible="false"
 				containId="true" pageId="viewASNExceptionLogPage">
 			</popup>
-			 <commit id="2ruk21231" title="WMS2SAP-关闭" enableType="multi" invisible="false" confirmMessage="确认是否回传？">
+			 <commit id="2ruk21231" title="WMS-SAP关闭" enableType="multi" invisible="false" confirmMessage="确认是否回传？">
 <!-- 				<enableExpression><![CDATA[(${rd.qualityQty}==0)]]></enableExpression> -->
 				<mappings>
 					<mapping id="ids" className="list" />
@@ -246,6 +246,19 @@
 						editEnabled="true" />
 				</forwards>
 			</commit> 
+			 <commit id="2ruk2131a2122131" title="关闭不回传" enableType="multi" invisible="false" confirmMessage="确认是否回传？">
+				<mappings>
+					<mapping id="ids" className="list" />
+				</mappings>
+				<actions>
+					<action managerName="moveDocManager" methodName="updateSapStatus"
+						parameter="ids" />
+				</actions>
+				<forwards>
+					<forward name="refreshWindow" newEnabled="true"
+						editEnabled="true" />
+				</forwards>
+			</commit> 
 		</buttons>
 	</maintainPage>
 </pages>

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

@@ -88,7 +88,7 @@
  asnDetail.lotInfo.propC3,
   asnDetail.lotInfo.propC6,
   asnDetail.lotInfo.propC7,
-  ad.lotInfo.propLC5,
+  asnDetail.lotInfo.propLC5,
  asnDetail.description
  FROM ASNDetail asnDetail
  left join asnDetail.item item 

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

@@ -77,10 +77,10 @@
  agv.inStock,
  agv.beIssue,
  agv.founderName,
- agv.inboundTotal,
+ 
- agv.type,
  agv.stationCode,
  agv.jobPriorityType,
+ agv.jobPriority,
  agv.jobType,
  agv.workMode,
  agv.returnTime,
@@ -106,7 +106,9 @@
  agv.agvStartSlotCode,
  agv.agvEndSlotCode,
  agv.agvRemarks,
- agv.agvReturnRemarks
+ agv.agvReturnRemarks,
+ agv.inboundTotal,
+ agv.type
  from AgvTask  agv
  where 1=1 
  and ( agv.status in ('NONCHECKED','ATCALL','ATWAIT','ATWORK','ATPICK','LISTING_FAILED') 
@@ -143,12 +145,11 @@
 			<column id="agv.leaveTime2" title="到站时间" width="70" visible="true" horizonAlign="center" format="dateTiemFormatter"/>
 			<column id="agv.outStock" title="整理出库库位" width="100" visible="false" horizonAlign="center" />
 			<column id="agv.inStock" title="整理入库库位" width="100" visible="false" horizonAlign="center" />
-			<column id="agv.beIssue" title="下发AGV" width="100" visible="true" horizonAlign="center" />
+			<column id="agv.beIssue" title="下发AGV" width="60" visible="true" horizonAlign="center" />
 			<column id="agv.founderName" title="创建人" width="60" visible="true" horizonAlign="center" />
-			<column id="agv.inboundTotal" title="热度值" width="60" visible="true" horizonAlign="center" />
+			<column id="agv.stationCode" title="AGV*RCS交互区域" width="50" visible="true" horizonAlign="center" />
-			<column id="agv.type" title="业务类型" width="60" visible="true" horizonAlign="center" />
+			<column id="agv.jobPriorityType" title="加急" width="40" visible="true" horizonAlign="center" />
-			<column id="agv.stationCode" title="AGV*RCS交互区域" width="80" visible="true" horizonAlign="center" />
+			<column id="agv.jobPriority" title="AGV等级" width="50" visible="true" horizonAlign="center" />
-			<column id="agv.jobPriorityType" title="AGV等级" width="80" visible="true" horizonAlign="center" />
 			<column id="agv.jobType" title="任务类型" width="120" visible="false" horizonAlign="center" />
 			<column id="agv.workMode" title="作业模式" width="150" visible="false" horizonAlign="center" />
 			<column id="agv.returnTime1" title="返库日期" width="70" visible="true" horizonAlign="center" format="dateFormatter"/>
@@ -175,6 +176,8 @@
 			<column id="agv.agvEndSlotCode" title="返库料箱位置编码" width="120" visible="true" horizonAlign="center" />
 			<column id="agv.agvRemarks" title="箱到站时间" width="150" visible="true" horizonAlign="center" />
 			<column id="agv.agvReturnRemarks" title="箱返库时间" width="150" visible="true" horizonAlign="center" />
+			<column id="agv.inboundTotal" title="热度值" width="60" visible="true" horizonAlign="center" />
+			<column id="agv.type" title="业务类型" width="60" visible="true" horizonAlign="center" />
 		</columns>
 		<buttons>
 			<popup id="lookAGV" title="查看AGV拣货明细" enableType="single"

src/webapp/WEB-INF/classes/dataSourceContext.xml

@@ -24,21 +24,21 @@
         </property>
         <property name="url">
 <!--         	<value>jdbc:sqlserver://localhost:1433;DatabaseName=zwtest</value> -->
-         	<value>jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest</value>
+<!--          	<value>jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest</value> -->
 <!-- 	正式环境地址 -->
 <!-- 				<value>jdbc:sqlserver://10.1.96.105:1433;DatabaseName=LD_WMSDB</value> -->
-<!--         	<value>jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest</value> -->
+        	<value>jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest</value>
         </property>
         <property name="username">
 <!--          <value>WMSDB</value> -->
-             <value>sa</value>
+<!--              <value>sa</value> -->
-<!--             <value>wmsdb</value> -->
+            <value>wmsdb</value>
         </property>
         <property name="password">
 <!--         	<value>AmecDDbb32A</value> -->
 <!--         		<value>HPwd12#$</value> -->
-             <value>Amecadmin1!</value>
+<!--              <value>Amecadmin1!</value> -->
-<!--           <value>WmsYc@5688</value> -->
+          <value>WmsYc@5688</value>
         </property>
         <property name="maxActive">
             <value>500</value>

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

@@ -22,7 +22,7 @@ hibernate.dialect=com.dev.swms.server.utils.MSSQLDialect
 #hibernate.dialect=org.hibernate.dialect.OracleDialect
 #hibernate.dialect=org.hibernate.dialect.Oracle9Dialect
 
-hibernate.show_sql=false
+hibernate.show_sql=true
 hibernate.format_sql=false
 hibernate.hbm2ddl.auto=none
 ldxt.bz=0