界面查询调整

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

@@ -467,4 +467,8 @@ public interface ASNManager extends BaseManager{
 	void cancelPuts(List<Long> ids);
 	
 	double getwsQtyMap(Map map);
+	//批量打印整理标签
+	@Transactional
+	void printOrderAll(List<Long> ids,Long print);
+
 }

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

@@ -4712,4 +4712,55 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
 			}
 			return qty;
 		}
+		
+		@Override
+		public void printOrderAll(List<Long> ids,Long print){
+			SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMdd");
+		
+			double allocatedQuantity = 0;
+			for (Long id: ids) {
+				ASN asn=commonDao.load(ASN.class, id);
+				List<ASNDetail> ads=commonDao.findByQuery(" from ASNDetail ad where ad.asn.id="
+				+id+" and ad.expectedQuantity>0");
+				for(ASNDetail ad:ads) {
+					Long quantity =1L;
+					Item item=commonDao.load(Item.class, ad.getItem().getId());
+					PrintEquipment pe=commonDao.load(PrintEquipment.class, print);
+					String qrcode="QAR/"+asn.getRelatedBill1()+"/"+ad.getStrBill8()+"/"+item.getCode()+"/"+item.getUnit();
+					if(ad.getStrBill2()!=null&&!ad.getStrBill2().equals("")) {
+						qrcode+="/"+ad.getStrBill2()+"/"+sdf.format(new Date());
+					}else {
+						qrcode+="//"+sdf.format(new Date());
+					}
+					JSONObject obj=new JSONObject();
+					obj.put("itemName", item.getName());
+					obj.put("unit", item.getUnit());
+					obj.put("quantity", ad.getExpectedQtyOfMasterUnit());
+					obj.put("taskCode", asn.getRelatedBill1());
+					obj.put("qrcode", qrcode);
+					obj.put("barCode", ad.getStrBill2()==null?"":ad.getStrBill2());
+					obj.put("loc", ad.getLotInfo().getPropC2());
+					obj.put("itemCode", item.getCode());
+//					obj.put("propC1",sdf.format(new Date()));
+					obj.put("propC1",ad.getLotInfo().getPropC1());
+					obj.put("workName",UserHolder.getUser().getName());
+					System.out.println(obj.toString());
+					PrintTask pt=new PrintTask();
+					pt.setType("3");
+					pt.setStatus("0");
+					pt.setQuantity(quantity);
+					pt.setContent(obj.toString());
+					pt.setCreateName(UserHolder.getUser().getName());
+					pt.setCreateDate(new Date());
+					pt.setMac(pe.getMac());
+					pt.setPrintName(pe.getPrintName());
+					pt.setPrintTitle(asn.getRelatedBill1()+"/"+item.getCode());
+					commonDao.store(pt);
+				}
+				
+			}
+			
+		}
+
+		
 }

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

@@ -64,7 +64,7 @@ public class SwmsExportGridServlet extends BaseHttpServlet {
 //            logger.info("parameter:"+ids);
 //            logger.info("parameter2:");
             if(ids != null) {
-               ids = URLDecoder.decode(ids);
+               ids = URLDecoder.decode(ids,"utf-8");
             }
          }
 

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

@@ -53,7 +53,8 @@
 					forceOverride="false" manualEditable="true">
 					<hql><![CDATA[ select pl.code,
 					pl.code
-			 from PlantLocation  pl where 1=1 and pl.disabled=false order by pl.code]]></hql>
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
 				</list>
 <!-- 				<text id="inventory.propC2" title="LOC" row="3" col="1" -->
 <!-- 					readOnly="false" required="false" reserve="false" forceOverride="false" -->

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

@@ -32,9 +32,17 @@
 				<text id="detail.itemKey.item.name" title="物料描述" row="3" col="1" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-				<text id="detail.itemKey.lotInfo.propC2" title="LOC" row="3" col="2" readOnly="false"
+<!-- 				<text id="detail.itemKey.lotInfo.propC2" title="LOC" row="3" col="2" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="detail.itemKey.lotInfo.propC2" title="LOC" row="3" col="2"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>		
 				<list id="inventory.kqName" title="库区" row="4" col="2"
 					span="1" width="120px" readOnly="false" required="false" reserve="false"
 					forceOverride="false" manualEditable="true">

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

@@ -20,9 +20,17 @@
 				<text id="rd.itemKey.lotInfo.propC1" title="批次号" row="2" col="2" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1" readOnly="false"
+<!-- 				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>		
 				<text id="rd.itemKey.lotInfo.propC3" title="特殊记号" row="3" col="2" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />

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

@@ -35,9 +35,17 @@
 				<text id="rd.itemKey.lotInfo.propC1" title="批次号" row="2" col="1" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2" readOnly="false"
+<!-- 				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>		
 				<text id="rd.itemKey.lotInfo.propC3" title="特殊标记" row="2" col="3" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<pages>
+	<editPage id="editPrintAsnBillPage" title="批量打印"
+		entityClass="com.dev.swms.server.model.receiving.ASN" width="200"
+		height="220">
+		<inputUIs>
+			<hidden id="task.id" reserve="false" />
+            <list id="print" title="打印机" row="0" span="1"  
+			width="120" readOnly="false" required="true" reserve="true" forceOverride="true" >
+                    <hql><![CDATA[ select 
+                    w.id, 
+                    w.printName
+                    from PrintEquipment w
+  					where 1=1
+  					]]></hql>
+            </list>
+
+		</inputUIs>
+		<buttons>
+			<commit id="pick" title="0013D4FC457C1190272672531"
+				enableType="none" invisible="false">
+				<mappings>
+					<mapping id="parentIds" className="list" />
+					<mapping id="print" className="long" />
+				</mappings>
+				<actions>
+					<action managerName="asnManager" methodName="printOrderAll"
+						parameter="parentIds,print" />
+				</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/receiving/maintainASNDetailPage.xml

@@ -25,10 +25,10 @@
 				<list id="ad.lotInfo.propC2" title="LOC" row="1" col="2" width="120px"
 					readOnly="false" required="false" reserve="false" forceOverride="false"
 					enumType="PickTicketStatus">
-					<hql><![CDATA[ SELECT 
+					<hql><![CDATA[ select pl.code,
- commonCode.code,
+					pl.code
- commonCode.name From CommonCode commonCode 
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
- where commonCode.codeType = 'LOC']]></hql>
+			 order by pl.code ]]></hql>
 				</list>
 <!-- 				<text id="ad.lotInfo.propC2" title="LOC" row="1" col="2" readOnly="false" -->
 <!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->

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

@@ -173,7 +173,9 @@
 			<popup id="print" title="标签打印" enableType="single" invisible="false"
 				containId="true" pageId="maintainASNprintPage">
 			</popup>
-			
+			<popup id="printOrderAll" title="批量打印" enableType="multi" invisible="false"
+				containId="true" pageId="editPrintAsnBillPage">
+			</popup>
 		</buttons>
 	</maintainPage>
 </pages>

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

@@ -19,9 +19,17 @@
 				<text id="rd.itemKey.lotInfo.propC1" title="批次号" row="2" col="2" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1" readOnly="false"
+<!-- 				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="rd.itemKey.lotInfo.propC2" title="LOC" row="3" col="1"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>		
 				<text id="rd.itemKey.lotInfo.propC3" title="特殊记号" row="3" col="2" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />

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

@@ -35,9 +35,17 @@
 				<text id="rd.itemKey.lotInfo.propC1" title="批次号" row="2" col="1" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />
-				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2" readOnly="false"
+<!-- 				<text id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="rd.itemKey.lotInfo.propC2" title="LOC" row="2" col="2"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>	
 				<text id="rd.itemKey.lotInfo.propC3" title="特殊标记" row="2" col="3" readOnly="false"
 					required="false" reserve="false" forceOverride="false" inVisible="false"
 					trimSpace="false" />

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

@@ -33,9 +33,17 @@
 				showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/> -->
 				<!-- <booleanList id="beInput" title="是否收货" row="1" col="1" span="1" width="120" readOnly="false" 
 				required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
-				<text id="ad.lotInfo.propC2" title="LOC" row="2" col="1" readOnly="false"
+<!-- 				<text id="ad.lotInfo.propC2" title="LOC" row="2" col="1" readOnly="false" -->
-					required="false" reserve="false" forceOverride="false" inVisible="false"
+<!-- 					required="false" reserve="false" forceOverride="false" inVisible="false" -->
-					trimSpace="false" />
+<!-- 					trimSpace="false" /> -->
+				<list id="ad.lotInfo.propC2" title="LOC" row="2" col="2"
+					span="1" width="120px" readOnly="false" required="false" reserve="false"
+					forceOverride="false" manualEditable="true">
+					<hql><![CDATA[ select pl.code,
+					pl.code
+			 from PlantLocation  pl where 1=1 and pl.disabled=false 
+			 order by pl.code]]></hql>
+				</list>		
 				<!-- <dateRanger id="asn.orderDate" title="收货日期" row="2" col="2"  span="2" 
 				readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" 
 				showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/> -->

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

@@ -46,7 +46,7 @@
  FROM LocationStorage ls 
  WHERE 1=1
  and ls.name in ('201','202','203','204','205','206','207','208','209','210','211','212',
- '213','214','215','101','102','103','104','105','106','107')
+ '213','214','215','101','102','103','104','105','106','107','602','603','604','605')
  ]]></hql>
 			</list>
                 <list id="t.worker4.name" title="拣货人" row="2" col="3"

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://47.103.100.52: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=zwtest</value> -->
         </property>
         <property name="username">
-         <value>WMSDB</value>
+<!--          <value>WMSDB</value> -->
-<!--              <value>sa</value> -->
+             <value>sa</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>