diff --git a/src/main/java/com/dev/swms/server/model/inventory/Task.java b/src/main/java/com/dev/swms/server/model/inventory/Task.java
index f5e60c3..5818462 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/Task.java
+++ b/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;
}
diff --git a/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml b/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
index a3729fc..9e7c25b 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/inventory/task.hbm.xml
@@ -176,6 +176,7 @@
+
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 24ce255..5a1bdfd 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
@@ -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;
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 686d059..5fa73ff 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
@@ -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 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);
}
diff --git a/src/main/java/com/dev/swms/server/service/receiving/MoveDocManager.java b/src/main/java/com/dev/swms/server/service/receiving/MoveDocManager.java
index 0442f21..fd5e3a2 100644
--- a/src/main/java/com/dev/swms/server/service/receiving/MoveDocManager.java
+++ b/src/main/java/com/dev/swms/server/service/receiving/MoveDocManager.java
@@ -345,4 +345,8 @@ public interface MoveDocManager extends BaseManager {
@Transactional
void addLibraryTask(List ids);
+
+ @Transactional
+ void updateSapStatus(List ids);
+
}
diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java
index 1341fbc..3a13c61 100644
--- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java
+++ b/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 ids) {
+ for(Long id:ids) {
+ ReceivedRecord rd=commonDao.load(ReceivedRecord.class, id);
+ rd.setSapStatus("1");
+ commonDao.store(rd);
+ }
+ }
+
+
}
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 9050eae..9b3ae33 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
@@ -2895,8 +2895,9 @@ 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 swListObjects = jdbcManager.getList(sBuffer.toString());
for (Object[] objects : swListObjects) {
- String swName = objects[0].toString();
+ String swName = objects[0].toString();//工作站编号
+ //查询工作站有没有其它业务的任务。
+ List 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 lStorages = commonDao
.findByQuery(" from LocationStorage ls where ls.name='" + swName + "'");
LocationStorage locationStorage = lStorages.get(0);
// 查询波次出库单
-// List waveDocs = commonDao
-// .findByQuery("select w.id from WaveDoc w where w.status='PICKUP'");
-// logger.info("工作站拣货任务下发：" + swName + " 开始分配播种格,剩余" + blank);
if (true) {
// 查询所有含有task.agvStatus=1(未下发到工作站) 的子工单
List