From d705484810a6ccacf062a797a9bea8a1cb880138 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Wed, 16 Jul 2025 10:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E8=BD=AC?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84=E5=85=B6=E5=AE=83=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?-=E4=BB=93=E5=BA=93=E8=8E=B7=E5=8F=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/action/PickmToGeneralInAction.java  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java
index 6b099a0..e78459e 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java
@@ -9,6 +9,7 @@ import nc.jdbc.framework.processor.ColumnProcessor;
 import nc.pubitf.para.SysInitQuery;
 import nc.util.mmf.busi.service.PFPubService;
 import nc.util.mmf.framework.base.MMValueCheck;
+import nc.vo.bd.stordoc.StordocVO;
 import nc.vo.fi.pub.SqlUtils;
 import nc.vo.ic.m4a.entity.GeneralInBodyVO;
 import nc.vo.ic.m4a.entity.GeneralInHeadVO;
@@ -129,14 +130,23 @@ public class PickmToGeneralInAction implements ICommonAction {
         }
         String pkOrg = inVOS[0].getParentVO().getPk_org();
         String typeCode = SysInitQuery.getParaString(pkOrg, "ICIN_TYPE");
-        String warehouseId = SysInitQuery.getParaString(pkOrg, "ICIN_CK");
-        if (StringUtils.isEmpty(typeCode) || StringUtils.isEmpty(warehouseId)) {
+        String warehouseCode = SysInitQuery.getParaString(pkOrg, "ICIN_CK");
+        if (StringUtils.isEmpty(typeCode) || StringUtils.isEmpty(warehouseCode)) {
             ExceptionUtils.wrapBusinessException("当前组织缺失参数配置,请前往 [业务参数设置-组织] 配置仓库或入库类型参数");
         }
+        String pk_billtypeid = MyHelper.transferField(BilltypeVO.TABLENAME, BilltypeVO.PK_BILLTYPE_ID, BilltypeVO.PK_BILLTYPECODE, typeCode);
+        SqlBuilder sqlBuilder = new SqlBuilder();
+        sqlBuilder.append(" select " + StordocVO.PK_STORDOC);
+        sqlBuilder.append(" from " + StordocVO.getDefaultTableName());
+        sqlBuilder.append(" where dr = 0");
+        sqlBuilder.append(" and ");
+        sqlBuilder.append(StordocVO.CODE, warehouseCode);
+        sqlBuilder.append(" and ");
+        sqlBuilder.append(StordocVO.PK_ORG, pkOrg);
+        // NCCForUAPLogger.debug("sqlBuilder = " + sqlBuilder);
+        String warehouseId = (String) getDao().executeQuery(sqlBuilder.toString(), new ColumnProcessor());
+        // NCCForUAPLogger.debug("warehouseId = " + warehouseId);
         for (GeneralInVO inVO : inVOS) {
-            String pk_billtypeid = MyHelper.transferField(BilltypeVO.TABLENAME, BilltypeVO.PK_BILLTYPE_ID, BilltypeVO.PK_BILLTYPECODE, typeCode);
-            // String code = MyHelper.transferField(StordocVO.getDefaultTableName(),
-            //         StordocVO.CODE, StordocVO.PK_STORDOC, "");
             // 其它入库单的仓库、交易类型取自【业务参数设置】的默认值
             GeneralInHeadVO head = inVO.getHead();
             // head.setCtrantypeid("0001A110000000001S1E");