在制品

src/views/produce/components/feeding/components/semiProductBom.vue

@@ -27,11 +27,11 @@
           {{ row.code }}
         </template>
       </el-table-column>
-      <!-- <el-table-column label="批次号" type="code" minWidth="110">
+      <el-table-column label="批次号" type="code" minWidth="90">
         <template slot-scope="{ row, $index }">
           {{ row.batchNo }}
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column label="序列号" type="productSequence" minWidth="110">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.productSequence }}
@@ -39,17 +39,22 @@
       </el-table-column>
       <el-table-column label="名称" type="name" minWidth="110">
         <template slot-scope="{ row, $index }">
-          {{ row.name }} ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
-              ? '半成品'
-              : row.rootCategoryLevelId == 9
-              ? '产品'
-              : item.rootCategoryLevelId == 28
-              ? '废品'
-              : ''
-          }})
+          {{ row.name }} 
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="110">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
+                ? '半成品'
+                : row.rootCategoryLevelId == 9
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/inspection/components/semiProductJobBom.vue

@@ -34,18 +34,21 @@
       <el-table-column label="名称" prop="name" minWidth="140">
         <template slot-scope="{ row, $index }">
           {{ row.name }}
-
-          ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
-              ? '半成品'
-              : row.rootCategoryLevelId == 9
-              ? '产品'
-              : row.rootCategoryLevelId == 28
-              ? '废品'
-              : ''
-          }})
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="110">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
+                ? '半成品'
+                : row.rootCategoryLevelId == 9
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/inspection/components/semiProductJobBomPL.vue

@@ -236,18 +236,21 @@
       <el-table-column label="名称" prop="name" minWidth="140">
         <template slot-scope="{ row, $index }">
           {{ row.name }}
-
-          ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
-              ? '半成品'
-              : row.rootCategoryLevelId == 9
-              ? '产品'
-              : row.rootCategoryLevelId == 28
-              ? '废品'
-              : ''
-          }})
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="110">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
+                ? '半成品'
+                : row.rootCategoryLevelId == 9
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/jobBooking/components/jobDdBom.vue

@@ -108,7 +108,7 @@
                     </div>
                     
                 </div>
-                <div class="btn-margin" v-if="item.currentTaskDiagram.isFirstTask==1 && item.semiProductList.length==0">
+                <div class="btn-margin" v-if="item.currentTaskDiagram.isFirstTask==1 && item.semiProductList.length==0 && clientEnvironmentId!= 3">
                     <div class="lable lable100 rx-cc"></div>
                     <el-button class="" @click="singleQuery" type="primary">
                         创建在制品

src/views/produce/components/jobBooking/components/semiProductBom.vue

@@ -39,17 +39,22 @@
       </el-table-column>
       <el-table-column label="名称" type="name" minWidth="110">
         <template slot-scope="{ row, $index }">
-          {{ row.name }} ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
-              ? '半成品'
-              : row.rootCategoryLevelId == 9
-              ? '产品'
-              : item.rootCategoryLevelId == 28
-              ? '废品'
-              : ''
-          }})
+          {{ row.name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="110">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
+                ? '半成品'
+                : row.rootCategoryLevelId == 9
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -26,18 +26,21 @@
       <el-table-column label="名称" prop="name" minWidth="140">
         <template slot-scope="{ row, $index }">
           {{ row.name }}
-
-          ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="90">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
                 ? '半成品'
                 : row.rootCategoryLevelId == 9
-                  ? '产品'
-                  : row.rootCategoryLevelId == 28
-                    ? '废品'
-                    : ''
-          }})
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/jobBooking/components/semiProductJobBomPL.vue

@@ -313,18 +313,21 @@
       <el-table-column label="名称" prop="name" minWidth="140">
         <template slot-scope="{ row, $index }">
           {{ row.name }}
-
-          ({{
-            row.rootCategoryLevelId == 2
-              ? '在制品'
-              : row.rootCategoryLevelId == 23
-              ? '半成品'
-              : row.rootCategoryLevelId == 9
-              ? '产品'
-              : row.rootCategoryLevelId == 28
-              ? '废品'
-              : ''
-          }})
+        </template>
+      </el-table-column>
+      <el-table-column label="物品分类" type="rootCategoryLevelId" minWidth="110">
+        <template slot-scope="{ row, $index }">
+            {{
+              row.rootCategoryLevelId == 2
+                ? '在制品'
+                : row.rootCategoryLevelId == 23
+                ? '半成品'
+                : row.rootCategoryLevelId == 9
+                ? '产品'
+                : item.rootCategoryLevelId == 28
+                ? '废品'
+                : ''
+            }}
         </template>
       </el-table-column>
 

src/views/produce/components/jobBooking/index.vue

@@ -486,7 +486,7 @@ console.log('agasgasgs',this.taskObj.type)
       }
 
       if(this.taskObj.type !=6){
-        if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length==0||this.List[0].pickOutInList.length==0)){
+        if(this.reportNeedFeed==1&&!(this.List[0].semiProductList.length>0||this.List[0].pickOutInList.length>0)){
           this.loading.close();
           return this.$message.warning('请先投料再报工');
         }
@@ -596,7 +596,7 @@ console.log('4444444444',this.List)
       }
       let isSemiProduct=false
       this.List.map((semi)=>{
-        if(semi.semiProductList.length==0 && semi.singleReport==1 && semi.currentTaskDiagram.isFirstTask==1){
+        if(semi.semiProductList.length==0 && semi.singleReport==1 && semi.currentTaskDiagram.isFirstTask==1&&this.clientEnvironmentId!=3){
           isSemiProduct=true
           this.loading.close();
           setTimeout(() => {

src/views/produce/components/picking/pickingListSearch.vue

@@ -30,19 +30,19 @@
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品编码:" prop="code">
+        <el-form-item label="物品编码:" prop="categoryCode">
           <el-input
             clearable
             placeholder="请输入"
-            v-model.trim="where.code"
+            v-model.trim="where.categoryCode"
           ></el-input>
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="物品名称:" prop="assetName">
+        <el-form-item label="物品名称:" prop="categoryName">
           <el-input
             clearable
-            v-model="where.assetName"
+            v-model="where.categoryName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -122,9 +122,9 @@
 
         modelType: '',
         specification: '',
-        code: '',
+        categoryCode: '',
 
-        assetName: ''
+        categoryName: ''
       };
       return {
         defaultWhere,