商品编码手工填

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());

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,