diff --git a/src/main/java/adapterContext.xml b/src/main/java/adapterContext.xml
index 1d54f47..555d556 100644
--- a/src/main/java/adapterContext.xml
+++ b/src/main/java/adapterContext.xml
@@ -53,7 +53,7 @@
-
+
diff --git a/src/main/java/com/dev/swms/server/model/inventory/AgvTask.java b/src/main/java/com/dev/swms/server/model/inventory/AgvTask.java
index 1ef1627..87fc4a9 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/AgvTask.java
+++ b/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());
diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultAgvTaskManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultAgvTaskManager.java
index 49f2f17..76e037f 100644
--- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultAgvTaskManager.java
+++ b/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 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 ids) {
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
index d0a0027..6b88c99 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
@@ -1740,7 +1740,15 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
List- 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 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()+"托盘，
已到达缓存位,可以进站";
-// }else if(libraryTask.getClassification().equals("盘点")) {
-// str=libraryTask.getBarcode()+"托盘，已到达"+libraryTask.getToCellCode()+",可以盘点";
-// }else{
-//
-// }
}
//LED显示信息
libraryTask.setMes(str);
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
index f85f543..8874228 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
+++ b/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){
- sql+=" and ((md.RELATEBILLCODE) like ('"+ asn_code + "%') )";
- }
+// if(asn_code!=null && asn_code.length()>0){
+// 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();
}*/
diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
index 328f83a..302afd8 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
+++ b/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=" order by i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,"+hqlmaveloc+",i.statuss desc,i.storageDate,i.quantity";
+ hql2=hql2+","+hqlmaveloc;
}
}
@@ -3342,20 +3341,30 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
bsql+=" and b.plantCode='"+ptd.getNewLotInfo().getPropC9()+"'";
}
List 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(y10) {
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 Inventorys = commonDao.findByQuery(
hql1+hql2,new String[] { "id" },new Object[] { ptd.getItem().getId() });
diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
index c0df8e3..2c893ab 100644
--- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
+++ b/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());
diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
index 81688fc..af80f71 100644
--- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
+++ b/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 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) {
- throw new BusinessException("打印张数必须大于0");
+ if(nuber<=0||nuber>100) {
+ throw new BusinessException("打印张数1-100之间");
}
+
if(barCode.indexOf("/")!=-1){
str=barCode.split("/");
if(str.length>=2){
diff --git a/src/main/java/com/dev/swms/server/web/servlet/InventoryServlet.java b/src/main/java/com/dev/swms/server/web/servlet/InventoryServlet.java
index 8dd5703..4bd91bb 100644
--- a/src/main/java/com/dev/swms/server/web/servlet/InventoryServlet.java
+++ b/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(",");
- resultObject.put("returnCode", 1);
- resultObject.put("returnMsg","成功");
- resultOutput=resultObject.toString();
+ if(invIds!=null&&invIds.length()>0) {
+ String [] stsList=invIds.split(",");
+ List invidList=new ArrayList();
+ 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);
diff --git a/src/main/java/com/dev/swms/server/web/servlet/PrintServlet.java b/src/main/java/com/dev/swms/server/web/servlet/PrintServlet.java
index ca32ba6..9b318ec 100644
--- a/src/main/java/com/dev/swms/server/web/servlet/PrintServlet.java
+++ b/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;
diff --git a/src/test/yao/2025.sql b/src/test/yao/2025.sql
index fc3a54b..72b3d19 100644
--- a/src/test/yao/2025.sql
+++ b/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;
diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainAGVTASKPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainAGVTASKPage.xml
index 62e647b..78ea2f2 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainAGVTASKPage.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainAGVTASKPage.xml
@@ -35,15 +35,10 @@
-
-
-
+
+
+
@@ -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~/ ))
- /~agv.type: AND (agv.type) like ({agv.type}) ~/
- /~agv.errorMsg: AND agv.errorMessage like ({agv.errorMsg}) ~/
+ /~ordersAll: or 1=1 ~/ )
+ /~agv.type: AND agv.type like {agv.type} ~/
+ /~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}) ~/
diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml
index 8c516d5..a273943 100644
--- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml
+++ b/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" />
-
-
-
+
-
-
-
+
@@ -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} ~/
)
diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainOutStorageListPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainOutStorageListPage.xml
index 75d2344..53544d3 100644
--- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainOutStorageListPage.xml
+++ b/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 ]]>
-
-->
-
-
-
-
-
-
-
+
+
-