20241101更新

appengine/src/main/resources/api_file/api/web管理端API/生产管理/计划挤压排产管理/列表.ms

@@ -5,7 +5,7 @@
   "groupId" : "06d35cc5db5f4e6681262a1648c871c3",
   "name" : "列表",
   "createTime" : null,
-  "updateTime" : 1730109068864,
+  "updateTime" : 1730451538439,
   "lock" : null,
   "createBy" : null,
   "updateBy" : null,
@@ -162,6 +162,8 @@ String salesOrderCode = body["salesOrderCode"];
 String materialName = body["materialName"];
 String materialCode = body["materialCode"];
 String deliveryDate = body["deliveryDate"];
+String customerName = body["customerName"];
+String orderNo = body["orderNo"];
 
 String salesOrdeSelect = sql("salesOrder")
 String sql = """
@@ -189,7 +191,9 @@ String sql = """
     ?{salesOrderCode != null and salesOrderCode != "", and mps.sales_order_code = #{salesOrderCode}}
     ?{documentNumber != null and documentNumber != "", and mps.document_number = #{documentNumber}}
     ?{materialName != null and materialName != "", and msm.material_name like concat('%', #{materialName}, '%')}
-    ?{materialCode != null and materialCode != "", and mps.material_code like concat('%', #{materialCode}, '%')}   
+    ?{materialCode != null and materialCode != "", and mps.material_code like concat('%', #{materialCode}, '%')}
+    ?{customerName != null and customerName != "", and mci.customer_name like concat('%', #{customerName}, '%')}
+    ?{orderNo != null and orderNo != "", and msm.order_no like concat('%', #{orderNo}, '%')}   
     ?{deliveryDate != null and deliveryDate != '', and mso.delivery_date = #{deliveryDate}} 
 """;
 

manage/src/views/mini/productionManagement/extrusionProductionSchedule/materialsSelect.vue

@@ -32,6 +32,18 @@
             clearable
           >
           </el-input>
+          <el-input
+            v-model="search.orderNo"
+            placeholder="订单号"
+            clearable
+          >
+          </el-input>
+          <el-input
+            v-model="search.customerName"
+            placeholder="客户名称"
+            clearable
+          >
+          </el-input>
 
           <el-button
             type="primary"

manage/src/views/mini/productionManagement/processReport/materialsSelect.vue

@@ -9,29 +9,48 @@
     <el-container>
       <el-header>
         <div class="right-panel-search">
-          <thirdselect
+          <!-- <thirdselect
             v-model="search.materialCategory"
             :item="materialCategoryItem"
           >
-          </thirdselect>
+          </thirdselect> -->
 
-          <!-- 物料名称输入框 -->
           <el-input
             v-model="search.scheduleNumber"
             placeholder="挤压编码"
             clearable
           >
           </el-input>
+          <el-input
+            v-model="search.salesOrderCode"
+            placeholder="销售单号"
+            clearable
+          >
+          </el-input>
+          <el-input
+            v-model="search.orderNo"
+            placeholder="订单号"
+            clearable
+          >
+          </el-input>
+          <el-input
+            v-model="search.materialCode"
+            placeholder="物料编码"
+            clearable
+          >
+          </el-input>
+          <el-input
+            v-model="search.profileModel"
+            placeholder="型材型号"
+            clearable
+          >
+          </el-input>
           <el-button
             type="primary"
             icon="el-icon-search"
             @click="upsearch"
           ></el-button>
-          <el-button
+          <el-button type="primary" plain @click="add">添加</el-button>
-            type="primary"
-            plain
-            @click="add"
-          >添加</el-button>
         </div>
       </el-header>
       <el-main class="nopadding">
@@ -79,14 +98,15 @@ export default {
       params: module.tableSelect.params,
       selection: [],
       materialCategoryItem: {
-         options: { tb: 'product_material_categories', placeholder: '物料/产品分类' }
+        options: {
+          tb: "product_material_categories",
+          placeholder: "物料/产品分类",
+        },
       },
-      listData: []
+      listData: [],
     };
   },
-  mounted() {
+  mounted() {},
-
-  },
   methods: {
     //显示
     open() {
@@ -98,7 +118,9 @@ export default {
       this.listData = listData;
     },
     selectable(row, index) {
-      return !this.listData.some(item => row.materialCode == item.materialCode)
+      return !this.listData.some(
+        (item) => row.materialCode == item.materialCode
+      );
     },
     currentChange(row) {
       this.selection = [row];
@@ -108,7 +130,7 @@ export default {
       this.selection = selection;
     },
     add() {
-      this.$emit("success", this.selection)
+      this.$emit("success", this.selection);
       this.visible = false;
     },
     //搜索