提交代码姚

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

@@ -140,7 +140,7 @@ public class Task extends VersionalEntity {
 	private String strBill4;//合单库位
 	private String strBill5;//合单人
 	private String strBill6;//是否未未拆包装
-	private String strBill7;//
+	private String strBill7;//库位的容器
 	private String strBill8;//
 	private String strBill9;//
 	private String strBill10;//退料属性（T）

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

@@ -1100,9 +1100,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 						PickTicketDetail ptd =null;
 						List<PickTicketDetail> PickTicketDetails =  commonDao.findByQuery(" from PickTicketDetail ptd where ptd.pickTicket.id=:id and ptd.lineNumber=:lineNumber ",
 						new String[] { "id","lineNumber"},new Object[] {pTicket.getId(),lineNumber});
-//						if(applyDoc) {
 //					
-//						}
 						if (PickTicketDetails.size()>0) {
 							ptd=PickTicketDetails.get(0);
 						}else{
@@ -1748,8 +1746,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 			}else {
 				bequality=false;
 			}
-			/*String strBill2=asn.has("strBill2") ? asn.getString("strBill2") : "";//序列号
+	
-			String PO=asn.has("PO") ? asn.getString("PO") : "";//PO号*/
 			String strBill2=asn.has("strBill2") ? asn.getString("strBill2") : "";//序列号
 			String sourceId=asn.has("PO") ? asn.getString("PO") : "";//PO号=采购单号
 			String strBill1=asn.has("strBill1") ? asn.getString("strBill1") : "";//PO行项目号
@@ -1771,6 +1768,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 			String ZNETPR=asn.has("ZNETPR") ? asn.getString("ZNETPR") : "0";//单价
 			String WAERS=asn.has("WAERS") ? asn.getString("WAERS") : "";//货币单位
 			String MENGE=asn.has("MENGE") ? asn.getString("MENGE") : "";//数量
+			String requisitioner=asn.has("requisitioner") ? asn.getString("requisitioner") : "";//工号
 			
 			List<ASN> asns =  commonDao.findByQuery(" from ASN asn where asn.code=:code ",
 					new String[] { "code"},new Object[] {PO});
@@ -1993,11 +1991,11 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
 			lotInfo.setPropC2(propC2);
 			lotInfo.setPropC3(propC3);
 			lotInfo.setPropC5(propC5);
+			lotInfo.setPropC6(requisitioner);
 			lotInfo.setPropC7(requestor);
-			
 			if(item.getFeeType()!=null&&item.getFeeType().equals("OA")&&
-					requestor!=null&&requestor.length()>0) {
+					requisitioner!=null&&requisitioner.length()>0) {
-			List<Personnel> list=	commonDao.findByQuery(" from Personnel p where p.code='"+requestor+"'");
+			List<Personnel> list=	commonDao.findByQuery(" from Personnel p where p.number='"+requisitioner+"'");
 				if(list.size()>0) {
 					Personnel p=list.get(0);
 					lotInfo.setPropC6(p.getNumber());

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

@@ -404,7 +404,6 @@ public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAu
 				}else {
 					msg=msg+ptd.getItem().getCode()+",无匹配库存！ ";
 				}
-//				 shuaxinPick(pt);//刷新订单
 				
 			}else{
 				throw new BusinessException("任务状态错误!");

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

@@ -542,10 +542,11 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 					// task.setBillCode(task.getOldZrw());
 					// task.setEndRegion(task.getOldGzz());
 					// }
-					task.setAgvStatus(-1);
+//					if(task.getAgvStatus()>=1){
+//					task.setAgvStatus(-1);//旧逻辑运行，状态不动,先注释
+//						}
 					task.setOldGzz(gongZuoZhan.code);
 				
-				
 					task.setStrBill9(lx+"-"+fenPei.chf_fz);
 					task.setStrBill8(fenPei.twl);
 					this.commonDao.store(task);
@@ -1220,7 +1221,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
 				+ " LEFT JOIN ITEM item ON item.id= ik.ITEM_ID "
 				+ " LEFT JOIN WAVE_DOC wd ON wd.id= t.WAVE_DOC_ID  "
 				+ " WHERE 1 = 1  AND pt.BILL_TYPE_ID= 1094 and loc.ZONE_ID in (1763,1765,1766) "
-				+ " AND  t.agv_Status in (-1,1,2) "
+				+ " AND  t.agv_Status in (-2) " // (-1,1,2)
 				+ " AND t.WAVE_DOC_ID IS NOT NULL and t.END_REGION is not null and wd.code!='"
 				+ waveDocCode
 				+ "' "

src/test/yao/2024.sql

@@ -392,3 +392,66 @@ GO
 ALTER TABLE   INVENTORY    add description varchar(200) COLLATE Chinese_PRC_CI_AS  NULL;
 
 GO
+-------2025-02-12
+ALTER TABLE    task   add  OLD_GZZ varchar(100) COLLATE Chinese_PRC_CI_AS  NULL;
+GO
+ALTER TABLE    task   add  OLD_ZRW varchar(100) COLLATE Chinese_PRC_CI_AS  NULL;
+GO
+ALTER TABLE    WAVE_DOC   add  LOGIN int  NULL;
+GO
+update WAVE_DOC set LOGIN=0 where LOGIN is null;
+GO
+
+CREATE TABLE [dbo].[WAVE_DOC_SORT] (
+  [ID] numeric(19)  IDENTITY(1,1) NOT NULL,
+  [COLUME] varchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  [SORT] numeric(18)  NULL,
+  [DISABLED] tinyint  NULL,
+  [NAME] varchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
+  CONSTRAINT [PK__TASK_SOR__3214EC27C7F87A3A] PRIMARY KEY CLUSTERED ([ID])
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)  
+ON [PRIMARY]
+)  
+ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[WAVE_DOC_SORT] SET (LOCK_ESCALATION = TABLE)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'数据库字段名',
+'SCHEMA', N'dbo',
+'TABLE', N'WAVE_DOC_SORT',
+'COLUMN', N'COLUME'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'排序',
+'SCHEMA', N'dbo',
+'TABLE', N'WAVE_DOC_SORT',
+'COLUMN', N'SORT'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'禁用',
+'SCHEMA', N'dbo',
+'TABLE', N'WAVE_DOC_SORT',
+'COLUMN', N'DISABLED'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'名称',
+'SCHEMA', N'dbo',
+'TABLE', N'WAVE_DOC_SORT',
+'COLUMN', N'NAME'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'排序规则创波',
+'SCHEMA', N'dbo',
+'TABLE', N'WAVE_DOC_SORT'
+
+ALTER TABLE   LOCATION_STORAGE    add be_auto tinyint  NULL;
+GO
+update LOCATION_STORAGE set be_auto=0 where be_auto is null;
+GO

src/webapp/WEB-INF/classes/config/origen/base/maintainPersonnelPage.xml

@@ -18,7 +18,7 @@
 				<text id="ps.bumen" title="部门" width="100"
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					inVisible="false" trimSpace="false" />
-				<text id="ps.code" title="编号" width="90"
+				<text id="ps.code" title="账号" width="90"
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					inVisible="false" trimSpace="false" />
 				<text id="ps.email" title="邮箱" row="2" col="2"

src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoKtPage.xml

@@ -132,18 +132,20 @@
             <popup id="modify" title="查看" enableType="single" invisible="false"
 				containId="true" pageId="modifyXLinfoPage">
 			</popup> 
-            <commit id="chukongtuo" title="出空托" enableType="none" invisible="false" >
+			<popup id="chukongtuo" title="出空托" enableType="multi" invisible="false" containId="false" pageId="editNullNewStockPage" />
-					<mappings>
+			
-						<mapping id="ids" className="list" />
+<!--             <commit id="chukongtuo" title="出空托" enableType="none" invisible="false" > -->
-					</mappings>
+<!-- 					<mappings> -->
-					<actions>
+<!-- 						<mapping id="ids" className="list" /> -->
-						<action managerName="moveDocManager" methodName="stockCk" parameter="ids" />
+<!-- 					</mappings> -->
-					</actions>
+<!-- 					<actions> -->
-					<forwards>
+<!-- 						<action managerName="moveDocManager" methodName="stockCk" parameter="ids" /> -->
-						<forward name="refreshWindow" newEnabled="false"
+<!-- 					</actions> -->
-							editEnabled="false" />
+<!-- 					<forwards> -->
-					</forwards>
+<!-- 						<forward name="refreshWindow" newEnabled="false" -->
-			</commit>
+<!-- 							editEnabled="false" /> -->
+<!-- 					</forwards> -->
+<!-- 			</commit> -->
 			</buttons>
 	</maintainPage>
 </pages>

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

@@ -86,6 +86,7 @@
  asnDetail.strBill3,
  asnDetail.strBill2,
  asnDetail.lotInfo.propC3,
+  asnDetail.lotInfo.propC6,
   asnDetail.lotInfo.propC7,
  asnDetail.description
  FROM ASNDetail asnDetail
@@ -117,6 +118,7 @@
 				<column id="asnDetail.strBill3" width="80" title="质检标记" visible="true" horizonAlign="center" format="booleanFormat" formatParam="disabled"  />
 				<column id="asnDetail.strBill2" width="80" title="序列号" visible="true" horizonAlign="center" />
 				<column id="asnDetail.lotInfo.propC3" width="120" title="特殊标记" visible="true" horizonAlign="center" />
+				<column id="asnDetail.lotInfo.propC6" width="120" title="工号" visible="true" horizonAlign="center" />
 				<column id="asnDetail.lotInfo.propC7" width="120" title="申请人" visible="true" horizonAlign="center" />
 				<column id="asnDetail.description" width="220" title="备注" visible="true" horizonAlign="center" />
 			</columns>

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editNullNewStockPage" title="空托盘"
+		entityClass="com.dev.swms.server.model.inventory.Inventory" onClose="refreshParent"
+		width="300" height="200">
+		<inputUIs>
+			<hidden id="l.id" reserve="false" />
+			
+<!-- 			<text id="hj" title="工作站" row="1" col="1" readOnly="false" -->
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
+<!-- 					trimSpace="false" /> -->
+<!-- 					trimSpace="false" /> -->
+			<list id="hj" title="工作站" row="1" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="STATUS">
+				<hql><![CDATA[SELECT 
+ ls.code,
+ ls.code
+ FROM LocationStorage ls 
+ WHERE 1=1
+ and ls.name in ('602','603','604','605')
+ ]]></hql>
+			</list>
+<!-- 			<checkbox id="ordersAll" title="是否加急" row="5" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
+		</inputUIs>
+		<buttons>
+			<commit id="1231stockby122231" title="搬运"
+				enableType="none" invisible="false">
+				<mappings>
+					<mapping id="hj" className="string" />
+					<mapping id="parentIds" className="list" />
+				</mappings>
+				<actions>
+					<action managerName="moveDocManager" methodName="stockLibrartTask" parameter="hj,parentIds,ordersAll" />
+				</actions>
+				<forwards>
+					<forward name="refreshParent" newEnabled="true"
+						editEnabled="true" />
+					<forward name="closeWindow" newEnabled="true" editEnabled="true" />
+				</forwards>
+			</commit>
+		</buttons>
+	</editPage>
+</pages>

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

@@ -7,6 +7,9 @@
 				<text id="pickTicket.sourceId" title="SAP接口号" row="0" col="1"
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					inVisible="false" trimSpace="false" />
+				<text id="pickTicket.sourceType" title="SAP类型" row="0" col="2"
+					readOnly="false" required="false" reserve="false" forceOverride="false"
+					inVisible="false" trimSpace="false" />	
 				<text id="pickTicket.collectNo" title="预留号" row="1" col="1"
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					inVisible="false" trimSpace="false" />
@@ -73,6 +76,7 @@
   or  ( /~ordersAll: {ordersAll} = true~/ ))
  /~pickTicketDetail.newLotInfo.propC9: AND (pickTicketDetail.newLotInfo.propC9) = ({pickTicketDetail.newLotInfo.propC9}) ~/
  /~pickTicket.sourceId: AND (pickTicket.sourceId) LIKE ({pickTicket.sourceId}) ~/
+  /~pickTicket.sourceType: AND (pickTicket.sourceType) LIKE ({pickTicket.sourceType}) ~/
  /~waveCode: AND (pickTicket.waveDoc.code) like ({waveCode}) ~/
  /~seedWall: AND (pickTicket.executePlanNo) like ({seedWall}) ~/
  /~pickTicket.collectNo: AND (pickTicket.collectNo) like RTRIM({pickTicket.collectNo}) ~/

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

@@ -148,6 +148,8 @@
  agv.dateTime3,
  agv.dateTime3,
  agv.jobPriorityType,
+ t.oldGzz,
+ t.oldZrw,
  szone.name,
  pickTicket.sourceType,
  billType.name,
@@ -288,6 +290,8 @@
 			<column id="agv.dateTime3234" title="到输送线日期" visible="false" horizonAlign="center" format="dateFormatter" />
 			<column id="agv.dateTime3314" title="到输送线时间" visible="false" horizonAlign="center" format="dateTiemFormatter" />
 			<column id="agv.jobPriorityType" title="AGV等级" width="80" visible="false" horizonAlign="center" />
+			<column id="t.oldGzz" title="新工作站" width="80" visible="false" horizonAlign="center" />
+			<column id="t.oldZrw" title="新子任务" width="80" visible="false" horizonAlign="center" />
 			<column id="szone.name" title="拣货库区" visible="true" horizonAlign="center" />
 			<column id="pickTicket.sourceType"  title="SAP类型"  width="100" visible="true" horizonAlign="center" />
 			<column id="billType.name"  title="单据类型"  width="100" visible="true" horizonAlign="center" />