diff --git a/.classpath b/.classpath
index c7f02b9..a6ec438 100644
--- a/.classpath
+++ b/.classpath
@@ -119,5 +119,9 @@
+
+
+
+
diff --git a/src/main/java/PostTest.java b/src/main/java/PostTest.java
index 91d24dd..0e41779 100644
--- a/src/main/java/PostTest.java
+++ b/src/main/java/PostTest.java
@@ -48,10 +48,16 @@ public class PostTest {
// }fe80::2db:5cff:feea:c24f%wlan0
// String str= getMacByIP("192.168.2.88");
// "10-12-04".substring(2, 3);
-
-
- String ts="10-11-02";
- logger.info(ts.substring(6, 2));
+ Date date=new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int month = calendar.get(Calendar.MONTH)+1;
+ int year=calendar.get(Calendar.YEAR);
+ logger.info("date---"+date);
+ logger.info("month---"+month);
+ logger.info("year---"+year);
+// String ts="10-11-02";
+// logger.info(ts.substring(6, 2));
// String input = "hello123456";
// String encrypted = encryptMD5(input);
// logger.info("MD5加密后的字符串为: " + encrypted);
diff --git a/src/main/java/com/dev/swms/server/action/formatter/LookSignFileFormatter.java b/src/main/java/com/dev/swms/server/action/formatter/LookSignFileFormatter.java
new file mode 100644
index 0000000..8566f1b
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/action/formatter/LookSignFileFormatter.java
@@ -0,0 +1,30 @@
+package com.dev.swms.server.action.formatter;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+import com.dev.energy.server.format.Formatter;
+
+public class LookSignFileFormatter implements Formatter{
+
+ public String format(String property, Object cellValue, List origenData,
+ String referenceModel, String locale) {
+ //String type = cellValue == null ? "" : cellValue.toString();
+ String result = "";
+ String IP="";
+ try {
+ //获取IP地址
+ InetAddress addr = InetAddress.getLocalHost();
+ IP=addr.getHostAddress();
+ } catch (UnknownHostException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+// System.out.println("IP:"+IP);
+ String id = String.valueOf(origenData.get(0));
+ String type ="D";// String.valueOf(origenData.get(8));
+ result=""+"照片查看"+"";
+ return result;
+}
+}
diff --git a/src/main/java/com/dev/swms/server/model/base/ItemKey.java b/src/main/java/com/dev/swms/server/model/base/ItemKey.java
index 9208490..1cbaf7f 100644
--- a/src/main/java/com/dev/swms/server/model/base/ItemKey.java
+++ b/src/main/java/com/dev/swms/server/model/base/ItemKey.java
@@ -43,6 +43,9 @@ public class ItemKey extends Entity {
/** 包含库存 */
private Set inventories = new HashSet();
+ private boolean beMarkWeight=false;//是否序列号
+
+
public Set getInventories() {
return inventories;
}
diff --git a/src/main/java/com/dev/swms/server/model/base/SignFile.java b/src/main/java/com/dev/swms/server/model/base/SignFile.java
index 308585b..a64d06f 100644
--- a/src/main/java/com/dev/swms/server/model/base/SignFile.java
+++ b/src/main/java/com/dev/swms/server/model/base/SignFile.java
@@ -26,6 +26,8 @@ public class SignFile extends Entity{
/**备注*/
private String remark;//下载路径
+ private String viewfileUrl;//查询地址
+
private double length=0;//长
private double width=0;//宽
private double height=0;//高
@@ -34,6 +36,12 @@ public class SignFile extends Entity{
private int packNumber=0;//规格数量
+ public String getViewfileUrl() {
+ return viewfileUrl;
+ }
+ public void setViewfileUrl(String viewfileUrl) {
+ this.viewfileUrl = viewfileUrl;
+ }
public double getLength() {
return length;
}
diff --git a/src/main/java/com/dev/swms/server/model/base/signFile.hbm.xml b/src/main/java/com/dev/swms/server/model/base/signFile.hbm.xml
index af9edfa..0000535 100644
--- a/src/main/java/com/dev/swms/server/model/base/signFile.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/base/signFile.hbm.xml
@@ -53,5 +53,6 @@
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/inventory/InventoryLog.java b/src/main/java/com/dev/swms/server/model/inventory/InventoryLog.java
index 77644d3..3cb99cf 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/InventoryLog.java
+++ b/src/main/java/com/dev/swms/server/model/inventory/InventoryLog.java
@@ -64,7 +64,7 @@ public class InventoryLog extends Entity {
private String strbill1;//移动类型
private String strbill2;//-LOC
private String strbill3;//工厂
-
+ private String itemCode;//料号
public String getStrbill1() {
return strbill1;
diff --git a/src/main/java/com/dev/swms/server/model/inventory/InventoryQueryView.java b/src/main/java/com/dev/swms/server/model/inventory/InventoryQueryView.java
new file mode 100644
index 0000000..db08d08
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/inventory/InventoryQueryView.java
@@ -0,0 +1,257 @@
+package com.dev.swms.server.model.inventory;
+
+import java.util.Date;
+
+import com.dev.energy.server.model.Entity;
+import com.dev.swms.server.model.base.Location;
+import com.dev.swms.server.model.base.WarehouseArea;
+
+public class InventoryQueryView extends Entity{
+
+ private Long id;//序号
+ private String locCode;//库位
+ private String itemCode;//物料号
+ private String UNIT;//单位
+ private String itemName;//物料描述
+ private String status;//库存状态
+ private double quantity;//库存数量
+ private double queuedQuantity;//占用数量
+ private String propC1;//批号
+ private String propC2;//LOC
+ private String propC3;//特殊标记-箱号
+ private String propC4;//序列号
+ private String propC5;//特殊库存业务编号
+ private String propC6;//需求人
+ private String propC7;//
+ private String propC8;//
+ private String propC9;//工厂
+ private String propLC1;//OA暂存库存标记
+ private String propLC2;//成品标记/扩展2
+ private String propLC3;//元值/扩展1
+ private String propLC4;//币种
+ private String propLC5;//用途
+ private Date propD1;//生产日期
+ private Date propD2;//失效日期
+ private Date propD3;//预计取回日期
+ private String kqName;//库区
+ private Date storageDate;//存货日期
+ private boolean lock;//盘点锁定
+ private boolean beSAPItem;////是否SAP料号
+ private Location location;////
+ private boolean validity=false;//是否有效期
+ private String statuss;//库存状态
+ private WarehouseArea zone;//库区
+ private String moveStatus;//移动工作站
+ private String invDes;//冻结备注
+ public Long getId() {
+ return id;
+ }
+ public void setId(Long id) {
+ this.id = id;
+ }
+ public String getLocCode() {
+ return locCode;
+ }
+ public void setLocCode(String locCode) {
+ this.locCode = locCode;
+ }
+ public String getItemCode() {
+ return itemCode;
+ }
+ public void setItemCode(String itemCode) {
+ this.itemCode = itemCode;
+ }
+ public String getUNIT() {
+ return UNIT;
+ }
+ public void setUNIT(String uNIT) {
+ UNIT = uNIT;
+ }
+ public String getItemName() {
+ return itemName;
+ }
+ public void setItemName(String itemName) {
+ this.itemName = itemName;
+ }
+ public String getStatus() {
+ return status;
+ }
+ public void setStatus(String status) {
+ this.status = status;
+ }
+ public double getQuantity() {
+ return quantity;
+ }
+ public void setQuantity(double quantity) {
+ this.quantity = quantity;
+ }
+ public double getQueuedQuantity() {
+ return queuedQuantity;
+ }
+ public void setQueuedQuantity(double queuedQuantity) {
+ this.queuedQuantity = queuedQuantity;
+ }
+ public String getPropC1() {
+ return propC1;
+ }
+ public void setPropC1(String propC1) {
+ this.propC1 = propC1;
+ }
+ public String getPropC2() {
+ return propC2;
+ }
+ public void setPropC2(String propC2) {
+ this.propC2 = propC2;
+ }
+ public String getPropC3() {
+ return propC3;
+ }
+ public void setPropC3(String propC3) {
+ this.propC3 = propC3;
+ }
+ public String getPropC4() {
+ return propC4;
+ }
+ public void setPropC4(String propC4) {
+ this.propC4 = propC4;
+ }
+ public String getPropC5() {
+ return propC5;
+ }
+ public void setPropC5(String propC5) {
+ this.propC5 = propC5;
+ }
+ public String getPropC6() {
+ return propC6;
+ }
+ public void setPropC6(String propC6) {
+ this.propC6 = propC6;
+ }
+ public String getPropC7() {
+ return propC7;
+ }
+ public void setPropC7(String propC7) {
+ this.propC7 = propC7;
+ }
+ public String getPropC8() {
+ return propC8;
+ }
+ public void setPropC8(String propC8) {
+ this.propC8 = propC8;
+ }
+ public String getPropC9() {
+ return propC9;
+ }
+ public void setPropC9(String propC9) {
+ this.propC9 = propC9;
+ }
+ public String getPropLC1() {
+ return propLC1;
+ }
+ public void setPropLC1(String propLC1) {
+ this.propLC1 = propLC1;
+ }
+ public String getPropLC2() {
+ return propLC2;
+ }
+ public void setPropLC2(String propLC2) {
+ this.propLC2 = propLC2;
+ }
+ public String getPropLC3() {
+ return propLC3;
+ }
+ public void setPropLC3(String propLC3) {
+ this.propLC3 = propLC3;
+ }
+ public String getPropLC4() {
+ return propLC4;
+ }
+ public void setPropLC4(String propLC4) {
+ this.propLC4 = propLC4;
+ }
+ public String getPropLC5() {
+ return propLC5;
+ }
+ public void setPropLC5(String propLC5) {
+ this.propLC5 = propLC5;
+ }
+ public Date getPropD1() {
+ return propD1;
+ }
+ public void setPropD1(Date propD1) {
+ this.propD1 = propD1;
+ }
+ public Date getPropD2() {
+ return propD2;
+ }
+ public void setPropD2(Date propD2) {
+ this.propD2 = propD2;
+ }
+ public Date getPropD3() {
+ return propD3;
+ }
+ public void setPropD3(Date propD3) {
+ this.propD3 = propD3;
+ }
+ public String getKqName() {
+ return kqName;
+ }
+ public void setKqName(String kqName) {
+ this.kqName = kqName;
+ }
+ public Date getStorageDate() {
+ return storageDate;
+ }
+ public void setStorageDate(Date storageDate) {
+ this.storageDate = storageDate;
+ }
+ public boolean isLock() {
+ return lock;
+ }
+ public void setLock(boolean lock) {
+ this.lock = lock;
+ }
+ public boolean isBeSAPItem() {
+ return beSAPItem;
+ }
+ public void setBeSAPItem(boolean beSAPItem) {
+ this.beSAPItem = beSAPItem;
+ }
+ public Location getLocation() {
+ return location;
+ }
+ public void setLocation(Location location) {
+ this.location = location;
+ }
+ public boolean isValidity() {
+ return validity;
+ }
+ public void setValidity(boolean validity) {
+ this.validity = validity;
+ }
+ public String getStatuss() {
+ return statuss;
+ }
+ public void setStatuss(String statuss) {
+ this.statuss = statuss;
+ }
+ public WarehouseArea getZone() {
+ return zone;
+ }
+ public void setZone(WarehouseArea zone) {
+ this.zone = zone;
+ }
+ public String getMoveStatus() {
+ return moveStatus;
+ }
+ public void setMoveStatus(String moveStatus) {
+ this.moveStatus = moveStatus;
+ }
+ public String getInvDes() {
+ return invDes;
+ }
+ public void setInvDes(String invDes) {
+ this.invDes = invDes;
+ }
+
+}
diff --git a/src/main/java/com/dev/swms/server/model/inventory/inventoryQueryView.hbm.xml b/src/main/java/com/dev/swms/server/model/inventory/inventoryQueryView.hbm.xml
new file mode 100644
index 0000000..4cdb184
--- /dev/null
+++ b/src/main/java/com/dev/swms/server/model/inventory/inventoryQueryView.hbm.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/model/shipping/PickTicket.java b/src/main/java/com/dev/swms/server/model/shipping/PickTicket.java
index 63ee200..0e32036 100644
--- a/src/main/java/com/dev/swms/server/model/shipping/PickTicket.java
+++ b/src/main/java/com/dev/swms/server/model/shipping/PickTicket.java
@@ -142,8 +142,8 @@ public class PickTicket extends AbstractMoveDoc {
private InventoryApply inventoryApply;
private int printCount = 0;//回传标识Finished=3
private String applyDoc;
- private Boolean beCreateBOL = Boolean.FALSE;//是否被合并订单
- private Boolean beCreateOrder = Boolean.FALSE;//是否合并
+ private Boolean beCreateBOL = Boolean.FALSE;//不回传SAP
+ private Boolean beCreateOrder = Boolean.FALSE;//
private BoxModel boxModel;
private Long executePlan;//采购订单项次号
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 1841dad..a53d10e 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
@@ -2298,6 +2298,7 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
//加急接口
public void updateUrgentAgvTask(List ids) {
Long h=9999L;
+ Map> maplist=new HashedMap();
if(ids.size()>0) {
Date day=new Date();
String hql="select min(agv.jobPriority) from AgvTask agv where agv.jobPriorityType=1 and agv.jobPriority>100 "
@@ -2305,8 +2306,27 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
DateUtil.formatDateYMDToStr(day)+"' group by CONVERT(varchar(100), agv.createTime, 23) ";
List list=commonDao.findByQuery(hql);
if(list.size()>0) {
- h=list.get(0)-50;
+ h=list.get(0)-99;
}
+ List listcode=new ArrayList();
+ String hql2=" from AgvTask agv where "
+ + " agv.status='ATCALL' and agv.targetArea in('214','215') ";
+ listcode=commonDao.findByQuery(hql2);
+ if(listcode.size()>0) {
+ for(AgvTask ash:listcode) {
+ List lsy=new ArrayList();
+ if(maplist.containsKey(ash.getContainerCode())) {
+ lsy=maplist.get(ash.getContainerCode());
+ lsy.add(ash);
+ maplist.put(ash.getContainerCode(), lsy);
+ }else {
+ lsy.add(ash);
+ maplist.put(ash.getContainerCode(), lsy);
+ }
+ }
+
+ }
+
}
for(Long id:ids) {
boolean flag=false;
@@ -2339,6 +2359,15 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
agv.setRemarks("超时加急任务");
agv.setUrgentTime(new Date());
commonDao.store(agv);
+ if(maplist.size()>0&&maplist.containsKey(agv.getContainerCode())) {
+ List listasv=maplist.get(agv.getContainerCode());
+ for(AgvTask agv2:listasv) {
+ //取消214、215的任务
+ // AgvTask agvTask=commonDao.load(AgvTask.class, id);
+ cancellationAgvTask(agv2);
+ }
+ }
+
}else {
agv.setJobPriorityType(0L);
}
diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultItemManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultItemManager.java
index 9ecc4c0..81018e9 100644
--- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultItemManager.java
+++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultItemManager.java
@@ -406,7 +406,8 @@ public class DefaultItemManager extends DefaultBaseManager implements
}
dbKey.setSOI(itemKey.getSOI());
dbKey.setContent(itemKey.getContent());
- dbKey.setItem(commonDao.load(Item.class, itemKey.getItem().getId()));
+ Item item=commonDao.load(Item.class, itemKey.getItem().getId());
+ dbKey.setItem(item);
commonDao.store(dbKey);
}
return dbKey;
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/InterfaceRespManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/InterfaceRespManager.java
index 99b9cfe..79ccdd0 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/InterfaceRespManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/InterfaceRespManager.java
@@ -77,7 +77,8 @@ public interface InterfaceRespManager extends BaseManager{
//OA库存查询接口
@Transactional
JSONObject storeOAPERSONNEL(DataInterfaceLog log,String data);
-
+ @Transactional
+ JSONObject storeADILFIT(DataInterfaceLog log,String data);
//WCS传送带回传接口
void test();
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/QueryAppManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/QueryAppManager.java
index d1e106e..e0deb89 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/QueryAppManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/QueryAppManager.java
@@ -506,8 +506,10 @@ public interface QueryAppManager extends BaseManager {
JSONObject queryLoc(String taskIds,long userId,long warehouseId);
//查询合单完成的任务
- JSONObject exchangeOrder(String pickCode,String zone_code,long userId,long warehouseId);
+ JSONObject exchangeOrder(String pickCode,String zone_name,String zone,String orderType,long userId,long warehouseId);
//查询合单完成的任务
JSONObject queryNCR(String ncrCode,String locId,String itemCode,long userId,long warehouseId);
+ JSONObject queryOrderDetails(String BILLCODE,Long workerId,Long wId);
+
}
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultImageFileManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultImageFileManager.java
index 330d73a..45cad14 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultImageFileManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultImageFileManager.java
@@ -28,6 +28,7 @@ import com.dev.energy.server.model.EntityFactory;
import com.dev.energy.server.service.pojo.DefaultBaseManager;
import com.dev.energy.server.util.LocalizedMessage;
import com.dev.energy.server.web.security.UserHolder;
+import com.dev.swms.server.utils.DateUtil;
import com.dev.swms.server.utils.PicUtils;
import com.dev.swms.server.model.base.Item;
import com.dev.swms.server.model.base.SignFile;
@@ -273,14 +274,20 @@ public class DefaultImageFileManager extends DefaultBaseManager implements Image
if (signFile != null) {
commonDao.delete(signFile);
} else {
- throw new BusinessException("寰呭垹闄ゆ枃浠朵笉瀛樺湪锛�");
+ throw new BusinessException("无记录");
+ }
+ // 获取图片路径
+// String fileUrl = GlobalParamUtils
+// .getGloableStringValue("imageTarget")
+// + signFile.getFileName();
+ String fileUrl =signFile.getViewfileUrl();
+ int index=fileUrl.indexOf("=");
+ if(index >0) {
+ fileUrl=fileUrl.substring(index);
}
- // 鍒犻櫎瀵瑰簲鐨勫浘鐗囪祫鏂�
- String fileUrl = GlobalParamUtils
- .getGloableStringValue("imageTarget")
- + signFile.getFileName();
File file = new File(fileUrl);
file.delete();
+
}
}
@@ -459,8 +466,10 @@ public class DefaultImageFileManager extends DefaultBaseManager implements Image
fileName=code+"_"+fileName;
date = new Date();
}
- int year=date.getYear();
- int month=date.getMonth();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int month = calendar.get(Calendar.MONTH)+1;//获取当前月份
+ int year=calendar.get(Calendar.YEAR);//获取当前年
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String fileUrl2="zwwms/images/zwItem/"+year+"/"+month+"/";
String fileUrl="C:/tomcat-8080/webapps/"+fileUrl2;
@@ -497,6 +506,7 @@ public class DefaultImageFileManager extends DefaultBaseManager implements Image
// imageFile.setOrderId(objectId);
imageFile.setViewName(code);//料号、单号
imageFile.processFileRemark(fileName,fileUrl2);
+ imageFile.setViewfileUrl("*.asnImageServlet?imageSourcePath="+fileUrl+ fileName);
try {
imageFile.setLength(Double.parseDouble(length));
imageFile.setWidth(Double.parseDouble(width));
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java
index 5fde515..6be64b4 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java
@@ -1081,7 +1081,11 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
itemKey.getLotInfo().getPropC3() == null ? "" : itemKey.getLotInfo().getPropC3());
jsonobj2.put("MEINS", item.getUnit());
jsonobj2.put("TKFIQ", task.getMovedQuantityMU() + "");
- jsonobj2.put("SERIALNO", task.getBarCode() == null ? "" : task.getBarCode());
+ if(item.isBeMarkWeight()) {
+ jsonobj2.put("SERIALNO", task.getBarCode() == null ? "" : task.getBarCode());
+ }else {
+ jsonobj2.put("SERIALNO", "" );
+ }
jsonobj2.put("WMSID", task.getId());
jsonobj2.put("WERKS", task.getItemKey().getLotInfo().getPropC9() == null ? ""
: task.getItemKey().getLotInfo().getPropC9() + "");
@@ -1142,7 +1146,11 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
jsonobj2.put("ZSUBCONT", ptd.getStrBill11());//外协供应商
jsonobj2.put("SGTXT", ptd.getStrExtend1()== null ? "":ptd.getStrExtend1());//
jsonobj2.put("ZSTQTY", task.getMovedQuantityMU() + "");
- jsonobj2.put("SERNR", task.getBarCode());// 序列号
+ if(item.isBeMarkWeight()) {
+ jsonobj2.put("SERNR", task.getBarCode());// 序列号
+ }else {
+ jsonobj2.put("SERNR", "");// 序列号
+ }
jsonobj2.put("WERKS", task.getItemKey().getLotInfo().getPropC9() == null ? ""
: task.getItemKey().getLotInfo().getPropC9() + "");
jsonobj2.put("LGORT", task.getItemKey().getLotInfo().getPropC2() == null ? ""
@@ -1167,7 +1175,11 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
jsonobj2.put("MATNR", item.getCode());
jsonobj2.put("ZSUBCONT", ptd.getStrBill11());//外协供应商
jsonobj2.put("ZSTQTY", task.getMovedQuantityMU() + "");
- jsonobj2.put("SERNR", task.getBarCode());// 序列号
+ if(item.isBeMarkWeight()) {
+ jsonobj2.put("SERNR", task.getBarCode());// 序列号
+ }else {
+ jsonobj2.put("SERNR", "");// 序列号
+ }
jsonobj2.put("ZLGORTF", task.getItemKey().getLotInfo().getPropC2() == null ? ""
: task.getItemKey().getLotInfo().getPropC2() + "");// 发出LOC
jsonobj2.put("ZLGORTT", ptd.getLocType());// 接收LOC
@@ -1194,7 +1206,6 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
if(pickTicket!=null&&pickTicket.getCode().indexOf("CP")==-1
&&((pickTicket.getSourceId()!=null&&pickTicket.getSourceId().indexOf("OT")== -1)
|| pickTicket.getSourceId()==null )) {
-
String bs=doWmsReqSap(getPropertiesParm("ldxt.SAP")+ApiURL.doWmsReqSap, jsonobj.toString(),"数据"+pickTicket.getCode());
if(bs!=null&&!bs.equals("")&&OUTPUT(bs)) {
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 eb31ce6..bad7622 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
@@ -287,7 +287,6 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
String relatedBill3=pickTicket.has("MATNR_H") ? pickTicket.getString("MATNR_H") : ""; //头物料
String MAKTX=pickTicket.has("MAKTX_H") ? pickTicket.getString("MAKTX_H") : ""; //抬头物料描
String CY_SEQNR=pickTicket.has("CY_SEQNR") ? pickTicket.getString("CY_SEQNR") : ""; //抬头物料描
-
String TKCDA=pickTicket.has("TKCDA") ? pickTicket.getString("TKCDA") : ""; //任务下发日期
String TKCTI=pickTicket.has("TKCTI") ? pickTicket.getString("TKCTI") : ""; //任务下发时间
String strBill2=pickTicket.has("UPAIN") ? pickTicket.getString("UPAIN") : ""; //X=更新,Q=取消,update indicator(在task号码为Active时,可以修改需求数量,SAP以同task号传递给WMS,并且附上更新标识X给WMS)
@@ -3497,7 +3496,145 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
return json11;
}
-
+ public JSONObject storeADILFIT(DataInterfaceLog log, String data) {
+ JSONObject json0 = new JSONObject();
+ JSONArray resultInfo = new JSONArray();
+ // TODO 自动生成的方法存根
+ String msg="";
+ Long pid=null;
+ PickTicket pTicket=null;
+ JSONObject json = jsonDataPT(data);
+ for(int j=0;j BillTypes = commonDao.findByQuery(" from BillType bt where bt.code=:code",
+ new String[] { "code"},new Object[] {btCode});
+ if (BillTypes.size()>0) {
+ billType=BillTypes.get(0);
+ }else{
+ billType=this.load(BillType.class, 1020L);
+ }
+ Date orderDate=null;
+ try {
+ orderDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(DATUM+" "+UZEIT);
+ } catch (ParseException e1) {
+ // TODO 自动生成的 catch 块
+ e1.printStackTrace();
+ }
+
+ Warehouse warehouse=this.load(Warehouse.class, 1L);
+ Item item=null;
+ List- Items = commonDao.findByQuery(" from Item item where item.code=:code",
+ new String[] { "code"},new Object[] {icode});
+ if (Items.size()==0) {
+ JSONObject objectItem=new JSONObject();
+ objectItem.put("ZTKALI", sourceId);
+ objectItem.put("ZTALIN", lineNumber);
+ objectItem.put("MATNR", icode);
+ objectItem.put("errorcode", "205");
+ objectItem.put("errordescr", "料号不存在!");
+ resultInfo.add(objectItem);
+ continue;
+ }else{
+ item=Items.get(0);
+ }
+
+ if(msg==null || msg.length()<=0){
+
+ List pTickets = commonDao.findByQuery(" from PickTicket pt where pt.sourceId=:sourceId ",
+ new String[] { "sourceId"},new Object[] {sourceId});
+ try {
+ if (pTickets.size()>0) {
+ pTicket=pTickets.get(0);
+ }else {
+ pTicket=EntityFactory.getEntity(PickTicket.class);
+// pTicket.setCode(bussinessCodeManager.getCodeForYm("CP", 5));
+ pTicket.setCode("CP"+strBill7);
+ pTicket.setSourceId(sourceId);
+// pTicket.setDeliveryMode(deliveryMode);
+ pTicket.setWorkerName1(workerName1);//工厂
+ pTicket.setRelatedBill1(strBill7);
+ pTicket.setUpdateTime(new Date());
+ pTicket.setBeCreateBOL(true);//不回传SAP
+ pTicket.setCollectNo(pTicket.getCode());
+ if (true) {
+ pTicket.setBillType(billType);
+ pTicket.setOrderDate(orderDate);
+ pTicket.setWarehouse(warehouse);
+ pTicket.setSourceType(ptSourceType);
+ Structure company=this.load(Structure.class, 1L);
+ pTicket.setCompany(company);
+ pTicket.setStatus(PickTicketStatus.OPEN);
+ }
+ commonDao.store(pTicket);
+ pid=pTicket.getId();
+ }
+ PickTicketDetail ptd =null;
+ List 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 (PickTicketDetails.size()>0) {
+ ptd=PickTicketDetails.get(0);
+ }else{
+ ptd=EntityFactory.getEntity(PickTicketDetail.class);
+ }
+ ptd.setLineNumber(lineNumber);
+ ptd.setSOI(SOI);
+ ptd.setStrBill7(strBill7);
+ ptd.setItem(item);
+ ptd.setLocationName(locationName);//库存地点
+ ptd.setOrderQuantity(Double.parseDouble(orderQuantity));
+ NewLotInfo newLotInfo=new NewLotInfo();
+ newLotInfo.setPropC2(locationName);
+ newLotInfo.setPropC9(workerName1);
+ ptd.setStrBill8(strBill8);
+ ptd.setStrBill5(MEINS);
+ ptd.setNewLotInfo(newLotInfo);
+ ptd.setPickTicket(pTicket);
+ commonDao.store(ptd);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ if(pTicket!=null) {
+ pickTicketManager.refreshOrderQuantity(pTicket);
+ }
+ }
+
+
+ json0.accumulate("returnCode", "200");
+ json0.accumulate("returnFlag", "1");
+ json0.accumulate("returnDesc", "成功");
+ json0.accumulate("resultInfo", resultInfo);
+
+ JSONObject json1 = new JSONObject();
+ json1.put("return", json0);
+ JSONObject json11 = new JSONObject();
+ json11.put("Response", json1);
+ interfaceManager.updateDataInterfaceLog(log, null,json11.toString());
+ return json11;
+ }
}
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 5dfb193..d066931 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
@@ -2131,7 +2131,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
"left join ITEM_KEY ik on t.ITEM_KEY_ID=ik.id "+
"left join item i on i.ID=ik.ITEM_ID "+
"left join Seed_Wall sw on sw.id=t.Seed_Wall_ID"+
- " where t.PLAN_QUANTITY_MU-t.MOVED_QUANTITY_MU>0 and t.PLAN_QUANTITY_MU>0"
+ " where t.PLAN_QUANTITY_MU>t.MOVED_QUANTITY_MU and t.PLAN_QUANTITY_MU>0"
+ " and t.END_REGION='"+gzzCode+"'";
zgz_sql +=" group by t.BILLCODE,pt.id,wd.id,t.END_REGION ";
@@ -2172,14 +2172,15 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
}
billCodeqty=bilzte+"";
}
+ //子任务拣货完成,需要释放曹格
if(gzzCode!=null&&!gzzCode.equals("601")&&!gzzCode.equals("602")&&!gzzCode.equals("603")
&&!gzzCode.equals("604")&&!gzzCode.equals("605")) {
String g_sql="select t.BILLCODE,S.code,"
+"sum(t.PLAN_QUANTITY),sum(t.MOVED_QUANTITY_MU) "
+" from task t LEFT JOIN Seed_Wall S ON S.ID=T.Seed_Wall_ID "
- +" where t.Seed_Wall_ID is not null and t.END_REGION='"+gzzCode+"'"
+ +" where t.END_REGION='"+gzzCode+"'"
+" and t.popular>0 and t.INVENTORY_STATUS in('已入库','已出库') "
- + " and t.PLAN_QUANTITY>0 "
+ + " and t.PLAN_QUANTITY>0 and t.Seed_Wall_ID is not null "
+" group by t.BILLCODE,t.END_REGION,S.code "
+" order by t.BILLCODE,t.END_REGION,S.code ";
Query query2 = session.createSQLQuery(g_sql.toString());
@@ -2207,10 +2208,10 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
+ " left join LOCATION loc2 on loc2.id=b.SRC_LOC_ID "
+ " left join ITEM_KEY ik2 on ik2.id=b.ITEM_KEY_ID "
+ " left join item item2 on item2.id=ik2.ITEM_ID "
- + " where 1=1 and b.PLAN_QUANTITY_MU-b.MOVED_QUANTITY_MU>0 "
+ + " where 1=1 and b.PLAN_QUANTITY_MU>b.MOVED_QUANTITY_MU "
+ " and b.BILLCODE=t.BILLCODE "
+ " and loc2.id=loc.id and t.END_REGION=b.END_REGION "
- + " and item2.id=item.id AND b.PLAN_QUANTITY_MU-b.MOVED_QUANTITY_MU>0 "
+ + " and item2.id=item.id AND b.PLAN_QUANTITY_MU>b.MOVED_QUANTITY_MU "
+ " for xml Path('')),1,1,'') as tId,item.code as itemCode ,max(item.name) as itemName ,"
+ " sum(t.PLAN_QUANTITY_MU-t.MOVED_QUANTITY_MU) as quantity,max(ik.PROP_C5) as propC5,"
+ " loc.id as locid, loc.code as locCode,ik.PROP_C1 as propC1,ik.PROP_C2 as propC2,ik.PROP_C3 as propC3,"
@@ -2237,7 +2238,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
+ " left join agvtask agvtask on agvtask.ID=t.agvTask_ID "
+ " left join library_task lt on lt.ID=t.librarytask_id "
- + " where 1=1 and t.PLAN_QUANTITY_MU-t.MOVED_QUANTITY_MU>0 ");
+ + " where t.PLAN_QUANTITY_MU>t.MOVED_QUANTITY_MU ");
if(gzzCode.indexOf("602")>=0||gzzCode.indexOf("603")>=0){
isLk=Boolean.TRUE;
@@ -2386,10 +2387,10 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
//图片路径
String url="";
- String SignFile_Sql=" from SignFile sf where 1=1 and sf.objectId="+arrier[20]+" ";
- List SignFiles=commonDao.findByQuery(SignFile_Sql);
+ String SignFile_Sql=" select sf.remark from SignFile sf where sf.objectType='ITEM' and sf.objectId="+arrier[20]+" ";
+ List SignFiles=commonDao.findByQuery(SignFile_Sql);
if(SignFiles.size()>0){
- url=SignFiles.get(0).getRemark();
+ url=SignFiles.get(0);
}
obj.put("strExtend1", arrier[21]==null?"":arrier[21]);
obj.put("unit", arrier[22]==null?"":arrier[22]);
@@ -3419,8 +3420,8 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
+ " , max(t.srcLoc.zone.id) as zone_id , t.srcLoc.zone.beBill as beBill,"
+ " max(t.srcLoc.zone.levels) as levels2 ,t.srcLoc.zone.beStock as beStock "
+ " from Task t where "
- + " t.planQuantityMU>t.movedQuantityMU and t.agvTask.id is null and "
- + " t.agvStatus=1 and t.srcLoc.zone.carrierType.id=3 ";
+ + " t.agvStatus=1 and t.planQuantityMU>t.movedQuantityMU and "
+ + " t.srcLoc.zone.carrierType.id=3 and t.agvTask.id is null ";
if(z_id>0){
sql+=" and t.srcLoc.zone.id="+z_id+" ";
}
@@ -3693,6 +3694,13 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
Task task=this.load(Task.class, Long.parseLong(result.get(0)));
ItemKey ik=this.load(ItemKey.class, task.getItemKey().getId());
Item item=this.load(Item.class, ik.getItem().getId());
+ String url="";//图片地址
+ String SignFile_Sql=" from SignFile sf where sf.objectType='ITEM' and sf.objectId="+item.getId()+" ";
+ List SignFiles=commonDao.findByQuery(SignFile_Sql);
+ if(SignFiles.size()>0){
+ url=SignFiles.get(0).getRemark();
+ }
+ obj.put("url", url);
Location lc=commonDao.load(Location.class, task.getSrcLoc().getId());
WarehouseArea zone=commonDao.load(WarehouseArea.class, lc.getZone().getId());
String [] str=null;
@@ -8086,6 +8094,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
}
}else {
+ status = "1";
msg="任务未到站!";
}
}
@@ -10444,7 +10453,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
return resultJson;
}
- public JSONObject exchangeOrder(String pickCode,String zone_code,long userId,long warehouseId){
+ public JSONObject exchangeOrder(String pickCode,String zone_code,String zone,String orderType,long userId,long warehouseId){
JSONObject resultJson = new JSONObject();
JSONArray jsondata = new JSONArray();
String status="0";
@@ -10476,6 +10485,21 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
if(zone_code!=null&&zone_code.length()>0) {
sql+=" and z.name = '"+zone_code.trim()+"' ";
}
+ if(zone!=null&&zone.length()>0) {
+ if(zone.equals("三号")) {
+ sql+=" and z.id in(1798,1773,1817,1765,1763) ";
+ }else {
+ sql+=" and z.id in(1813,1819,1768,1822,1783,1808,1766) ";
+ }
+ }
+ if(orderType!=null&&orderType.length()>0) {
+ if(orderType.equals("工单")) {
+ sql+=" and pt.BILL_TYPE_ID = 1094 ";
+ }else {
+ sql+=" and pt.BILL_TYPE_ID <> 1094 ";
+ }
+
+ }
sql+=" group by t.BILLCODE,s.LP,lc.code,z.name,pt.equated_Quantity " +
" order by pt.equated_Quantity desc,max(t.dateBill3),t.BILLCODE,z.name,lc.code,s.LP ";
Query query = session.createSQLQuery(sql);
@@ -10501,11 +10525,13 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
if(soi!=null&&soi.length()>0) {
data1.put("bgColour", "1");//1=红色加急,
}else {
- if(Long.parseLong(ordeDate)>30) {
+ if(Long.parseLong(ordeDate)>60) {
data1.put("bgColour", "3");//3=浅蓝色,剩30分钟
- }else if(Long.parseLong(ordeDate)>60) {
- data1.put("bgColour", "2");//2=黄色,剩余60分钟
- }else {
+ }
+// else if(Long.parseLong(ordeDate)>30) {
+// data1.put("bgColour", "2");//2=黄色,剩余60分钟
+// }
+ else {
data1.put("bgColour", "0");//0=无颜色,
}
}
@@ -10598,6 +10624,66 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
return resultJson;
}
+ public JSONObject queryOrderDetails(String BILLCODE,Long workerId,Long wId) {
+ JSONObject resultJson = new JSONObject();
+ JSONArray jsondata = new JSONArray();
+ String status="0";
+ String msg="";
+ String data="";
+ Session session = ((HibernateDaoSupport) this.commonDao).getSessionFactory().openSession();
+ try {
+ if (workerId > 0) {
+ if (wId > 0) {
+ Worker worker1=commonDao.load(Worker.class, workerId);
+ String sql ="select item.code as code,CONVERT(VARCHAR, t.OPERATE_TIME, 120) as OPERATE_TIME,"
+ + "t.MOVED_QUANTITY_MU as MOVED_QUANTITY_MU" +
+ " from task t " +
+ " left join ITEM_KEY ik on ik.id=t.ITEM_KEY_ID " +
+ " left join item item on item.id=ik.ITEM_ID " +
+ " where t.PLAN_QUANTITY>0";
+ if(BILLCODE!=null&&BILLCODE.length()>0) {
+ sql+=" and t.BILLCODE='"+BILLCODE+"' ";
+ Query query = session.createSQLQuery(sql);
+ List