From cf6afbae39a0c927cff5e66ca5ebad0db1b7cbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Thu, 13 Feb 2025 10:18:15 +0800
Subject: [PATCH] =?UTF-8?q?2.=E5=88=9B=E5=BB=BA=E6=B3=A2=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=BA=E6=96=99=E7=AE=B1=E5=8C=BA=EF=BC=8C=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E5=8C=BA=E3=80=81=E7=AB=8B=E5=BA=93=E6=8C=89=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=BB=99=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E5=AE=83=E5=BA=93=E5=8C=BA=E6=8B=A3=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=8C=89=E5=8E=9F=E6=9D=A5=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E7=94=9F=E6=88=90=E5=AD=90=E4=BB=BB=E5=8A=A1=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocate/DefaultNewAutoAllocator.java     | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
index 15cbb72..16ac9d2 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
+++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
@@ -357,22 +357,27 @@ public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAu
 							Task task = EntityFactory.getEntity(Task.class);
 							task.setPickTicketDetail(ptd);
 							Item item=commonDao.load(Item.class, ptd.getItem().getId());
-							/*task.setBillCode(getSubWorkOrer(ptd.getPickTicket().getCode(),inventory.getLocation().getZone(),item));
-							//单个子任务数量
-							if(qty>0) {
-								List<Integer> tas=commonDao.findByQuery("select t.hs from PickTicketTaskView t where t.pickTicket.id="+ptd.getPickTicket().getId()
-								+" and t.billcode='"+task.getBillCode()+"' ");
-								if(tas.size()>0) {
-									//单个子任务数量
-									if(tas.get(0)>=qty) {
-										task.setBillCode(bussinessCodeManager.getCodeForYmd(ptd.getPickTicket().getCode()+"-", 2));
+							String zoneName=inventory.getLocation().getZone().getCode();
+							if (zoneName.equals("堆垛区")||zoneName.equals("货架到人")||zoneName.equals("料箱到人")) {
+								task.setBillCode(pt.getCode());
+							}else {
+								task.setBillCode(getSubWorkOrer(ptd.getPickTicket().getCode(),inventory.getLocation().getZone(),item));
+								//单个子任务数量
+								if(qty>0) {
+									List<Integer> tas=commonDao.findByQuery("select t.hs from PickTicketTaskView t where t.pickTicket.id="+ptd.getPickTicket().getId()
+									+" and t.billcode='"+task.getBillCode()+"' ");
+									if(tas.size()>0) {
+										//单个子任务数量
+										if(tas.get(0)>=qty) {
+											task.setBillCode(bussinessCodeManager.getCodeForYmd(ptd.getPickTicket().getCode()+"-", 2));
+										}
 									}
 								}
-							}*/
+							}
+							
 							if (inventory.getLocation().getStock()!=null) {
 								task.setStrBill7(inventory.getLocation().getStock().getLP());
 							}
-							task.setBillCode(pt.getRelatedBill2());
 							task.setCode(TimeNumberUtils.getTaskCode());
 							task.setType(TaskType.MV_PICKTICKET);
 							task.setItemKey(inventory.getItemKey());