From 7db829f4e5d6dc75c68f7c1aa97da149ee126e57 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Mon, 22 Apr 2024 10:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=BC=96=E7=A0=81=E6=89=8B?=
 =?UTF-8?q?=E5=B7=A5=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProductWarehouseServiceImpl.java     |  2 +-
 .../src/views/scm/productWarehouse/form.vue   | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
index 04a14699..a1567b23 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
@@ -486,7 +486,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
 
         if(isSave){
             String mainId = id ;
-            entity.setCode(generaterSwapUtil.getBillNumber("productcode", false));
+//            entity.setCode(generaterSwapUtil.getBillNumber("productcode", false));
             entity.setBarCode(generaterSwapUtil.getBillNumber("productBarCode", false));
             entity.setCreatorTime(DateUtil.getNowDate());
             entity.setCreatorUserId(userInfo.getUserId());
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
index 04a819ec..ae1ba231 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
@@ -77,6 +77,23 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('code')">
+            <jnpf-form-tip-item
+              label="商品编码"
+              v-if="judgeShow('code')"
+              prop="code"
+            >
+              <JnpfInput
+                v-model="dataForm.code"
+                @change="changeData('code', -1)"
+                placeholder="请输入"
+                :disabled="judgeWrite('code')"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfInput>
+            </jnpf-form-tip-item>
+          </el-col>
+          <!-- <el-col :span="8" v-if="judgeShow('code')">
             <jnpf-form-tip-item
               label="商品编码"
               v-if="judgeShow('code')"
@@ -92,7 +109,7 @@
               >
               </JnpfInput>
             </jnpf-form-tip-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8" v-if="judgeShow('name')">
             <jnpf-form-tip-item
               label="商品名称"
@@ -1019,6 +1036,13 @@ export default {
             trigger: "change"
           }
         ],
+        code: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur"
+          }
+        ],
         name: [
           {
             required: true,