临时生产计划新增新加客户选项

src/api/productionPlan/index.js

@@ -220,3 +220,28 @@ export async function getOrderBomRoot(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+// 根据产品查询BOM分类
+export async function findBomCategoryByCategoryId(categoryId) {
+  const res = await request.get(
+    `/aps/productionplan/findBomCategoryByCategoryId/${categoryId}`
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 根据计划id查询物料信息
+export async function findMaterialInfoByPlanId(params) {
+  const res = await request.get(
+    '/aps/productionplan/findMaterialInfoByPlanId',
+    {
+      params
+    }
+  );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/materialPlan/components/plan-edit-dialog.vue

@@ -830,7 +830,7 @@
       },
       chooseOrder(list) {
         let salesOrderIds = [];
-
+        console.log(list,'listlistlistlistlistlistlistlistlist 获取的数据')
         const tableList = this.$refs.table.getData() || [];
         const existingIds = tableList.map((item) => item.id);
 

src/views/productionPlan/components/factoryAdd/index.vue

@@ -1038,6 +1038,9 @@
         });
       },
       contactDialogSuccess(data){
+        console.log(data,'data 11')
+        // serialNo
+        this.form.serialNo = data.serialNo;
         this.$set(this.form,'customerName',data.name)
 
       },

src/views/productionPlan/components/homogeneityInspectDialog.vue

@@ -1,104 +1,146 @@
 <template>
   <div>
-  <ele-modal
-    width="90vw"
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    row-key="code"
-    custom-class="ele-dialog-form"
-    :title="'齐套性检查'"
-    :maxable="true"
-  >
-    <div class="form-wrapper">
-      <div v-if="leftShow" :style="{width: leftWidth}">
-        <el-tree :expand-on-click-node="false" :data="cardList" :props="treeProps" @node-click="handleNodeClick"></el-tree>
-      </div>
-      <div :style="{width: rightWidth}">
-        <div v-if="!leftShow" class="planInfo">
-          <el-row style="width: 100%;">
-            <el-col :span="planInfo.salesCode ? 6 : planInfo.salesCode.length * 6">
-              <div style="color: blue; display: flex;">
-                <div>销售单号：</div><div v-if="planInfo.salesCode"><span v-for="item in planInfo.salesCode">　{{item}}</span></div>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              计划编号：{{planInfo.code}}
-            </el-col>
-            <el-col :span="6">
-              批次号：{{planInfo.batchNo}}
-            </el-col>
-            <el-col :span="6">
-              名称：{{planInfo.productName}}
-            </el-col>
-            <el-col :span="6">
-              规格：{{planInfo.specification}}
-            </el-col>
-            <el-col :span="6">
-              型号：{{planInfo.model}}
-            </el-col>
-            <el-col :span="6">
-              计划数量：{{planInfo.productNum}}
-            </el-col>
-          </el-row>
+    <ele-modal
+      width="90vw"
+      :visible.sync="visible"
+      :close-on-click-modal="false"
+      row-key="code"
+      custom-class="ele-dialog-form"
+      :title="'齐套性检查'"
+      :maxable="true"
+    >
+      <div class="form-wrapper">
+        <div v-if="leftShow" :style="{ width: leftWidth }">
+          <el-tree
+            :expand-on-click-node="false"
+            :data="cardList"
+            :props="treeProps"
+            highlight-current
+            @node-click="handleNodeClick"
+          ></el-tree>
         </div>
-        <div>
-          <ele-pro-table
-            ref="table"
-            :needPage="false"
-            :columns="columns"
-            key="checkTable"
-            :init-load="false"
-            :datasource="datasource"
-          >
-            <template v-slot:stockCount="{ row }">
-              <el-link type="primary" :underline="false" @click="stockDetail(row)">
-                {{ row.stockCount }}
-              </el-link>
-            </template>
-            <template v-slot:currentCount="{ row }">
-              <el-link type="primary" :underline="false" @click="currentDetail(row)">
-                {{ row.currentCount }}
-              </el-link>
-            </template>
-            <template v-slot:stockColor="{ row }">
-              <div :class="{'statusRed' : row.stockStatus == '缺料'}">
-                {{row.stockStatus}}
-              </div>
-            </template>
-            <template v-slot:currentColor="{ row }">
-              <div :class="{'statusRed' : row.currentStatus == '缺料'}">
-                {{row.currentStatus}}
-              </div>
-            </template>
-            <template v-slot:finishColor="{ row }">
-              <div :class="{'statusRed' : row.finishStatus == '缺料'}">
-                {{row.finishStatus}}
-              </div>
-            </template>
-            <template v-slot:finishCount="{ row }">
-              <div>
-                <div v-if="row.finishCount > 0">{{row.finishCount}}</div>
-                <div v-else>-</div>
-              </div>
-            </template>
-          </ele-pro-table>
+        <div :style="{ width: rightWidth }">
+          <div v-if="!leftShow" class="planInfo">
+            <el-row style="width: 100%">
+              <el-col
+                :span="planInfo.salesCode ? 6 : planInfo.salesCode.length * 6"
+              >
+                <div style="color: blue; display: flex">
+                  <div>销售单号：</div
+                  ><div v-if="planInfo.salesCode"
+                    ><span v-for="item in planInfo.salesCode"
+                      >　{{ item }}</span
+                    ></div
+                  >
+                </div>
+              </el-col>
+              <el-col :span="6"> 计划编号：{{ planInfo.code }} </el-col>
+              <el-col :span="6"> 批次号：{{ planInfo.batchNo }} </el-col>
+              <el-col :span="6"> 名称：{{ planInfo.productName }} </el-col>
+              <el-col :span="6"> 规格：{{ planInfo.specification }} </el-col>
+              <el-col :span="6"> 型号：{{ planInfo.model }} </el-col>
+              <el-col :span="6"> 计划数量：{{ planInfo.productNum }} </el-col>
+            </el-row>
+            <el-row>
+              <el-form
+                :inline="true"
+                :model="formInline"
+                class="demo-form-inline"
+              >
+                <el-form-item label="审批人">
+                  <el-select
+                    size="mini"
+                    v-model="formInline.region"
+                    placeholder="BOM类型"
+                  >
+                    <el-option label="区域一" value="shanghai"></el-option>
+                    <el-option label="区域二" value="beijing"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="活动区域">
+                  <el-select
+                    size="mini"
+                    v-model="formInline.region"
+                    placeholder="BOM版本"
+                  >
+                    <el-option label="区域一" value="shanghai"></el-option>
+                    <el-option label="区域二" value="beijing"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </el-row>
+          </div>
+          <div>
+            <ele-pro-table
+              ref="table"
+              :needPage="false"
+              :columns="columns"
+              key="checkTable"
+              :init-load="false"
+              :datasource="datasourceList"
+            >
+              <template v-slot:stockCount="{ row }">
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="stockDetail(row)"
+                >
+                  {{ row.stockCount }}
+                </el-link>
+              </template>
+              <template v-slot:currentCount="{ row }">
+                <el-link
+                  type="primary"
+                  :underline="false"
+                  @click="currentDetail(row)"
+                >
+                  {{ row.currentCount }}
+                </el-link>
+              </template>
+              <template v-slot:stockColor="{ row }">
+                <div :class="{ statusRed: row.stockStatus == '缺料' }">
+                  {{ row.stockStatus }}
+                </div>
+              </template>
+              <template v-slot:currentColor="{ row }">
+                <div :class="{ statusRed: row.currentStatus == '缺料' }">
+                  {{ row.currentStatus }}
+                </div>
+              </template>
+              <template v-slot:finishColor="{ row }">
+                <div :class="{ statusRed: row.finishStatus == '缺料' }">
+                  {{ row.finishStatus }}
+                </div>
+              </template>
+              <template v-slot:finishCount="{ row }">
+                <div>
+                  <div v-if="row.finishCount > 0">{{ row.finishCount }}</div>
+                  <div v-else>-</div>
+                </div>
+              </template>
+            </ele-pro-table>
+          </div>
         </div>
       </div>
-    </div>
-    <div slot="footer">
-      <el-button plain @click="cancel">取消</el-button>
-      <el-button type="primary" @click="confirm">确定</el-button>
-    </div>
-  </ele-modal>
+      <div slot="footer">
+        <el-button plain @click="cancel">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
+      </div>
+    </ele-modal>
 
-  <stockDetailDialog ref="stockDetailDialog" />
+    <stockDetailDialog ref="stockDetailDialog" />
 
-  <currentDetailDialog ref="currentDetailDialog" />
+    <currentDetailDialog ref="currentDetailDialog" />
   </div>
 </template>
 
 <script>
-  import { homogeneityInspect, homogeneityInspectMerge } from '@/api/productionPlan/index.js';
+  import {
+    homogeneityInspect,
+    homogeneityInspectMerge,
+    findMaterialInfoByPlanId,
+    findBomCategoryByCategoryId
+  } from '@/api/productionPlan/index.js';
   import stockDetailDialog from './stockDetailDialog.vue';
   import currentDetailDialog from './currentDetailDialog.vue';
   export default {
@@ -117,10 +159,10 @@
           deviceId: ''
         },
         requiredFormingNum: 0,
-
-        form: {
-          homogeneityInspect: []
-        },
+        formInline: {},
+        // form: {
+        //   homogeneityInspect: []
+        // },
 
         rules: {},
 
@@ -133,52 +175,52 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          // {
+          //   prop: 'productCode',
+          //   label: '计划编号',
+          //   align: 'center',
+          //   minWidth: 100,
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   prop: 'opCode',
+          //   label: '工序编码',
+          //   align: 'center',
+          //   minWidth: 100,
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   prop: 'opName',
+          //   label: '工序名称',
+          //   align: 'center',
+          //   minWidth: 100
+          // },
+          // {
+          //   prop: 'bomCode',
+          //   label: '物料编码',
+          //   align: 'center',
+          //   minWidth: 100,
+          //   showOverflowTooltip: true
+          // },
+          // {
+          //   prop: 'bomName',
+          //   label: '物料名称',
+          //   align: 'center',
+          //   minWidth: 100
+          // },
           {
-            prop: 'productCode',
-            label: '计划编号',
-            align: 'center',
-            minWidth: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'opCode',
-            label: '工序编码',
-            align: 'center',
-            minWidth: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'opName',
-            label: '工序名称',
-            align: 'center',
-            minWidth: 100
-          },
-          {
-            prop: 'bomCode',
-            label: '物料编码',
-            align: 'center',
-            minWidth: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'bomName',
-            label: '物料名称',
-            align: 'center',
-            minWidth: 100
-          },
-          {
-            prop: 'count',
+            prop: 'demandQuantity',
             label: '定额数量',
             align: 'center',
             minWidth: 80
           },
-          {
-            slot: 'stockCount',
-            prop: 'stockCount',
-            label: '库存数量',
-            align: 'center',
-            minWidth: 80
-          },
+          // {
+          //   slot: 'stockCount',
+          //   prop: 'stockCount',
+          //   label: '库存数量',
+          //   align: 'center',
+          //   minWidth: 80
+          // },
           {
             slot: 'stockColor',
             prop: 'stockStatus',
@@ -187,25 +229,31 @@
             minWidth: 80
           },
           {
-            slot: 'currentCount',
-            prop: 'currentCount',
+            slot: 'inTransitNum',
+            prop: 'inTransitNum',
             label: '在途数量',
             align: 'center',
             minWidth: 80
           },
+          // {
+          //   slot: 'currentColor',
+          //   prop: 'currentStatus',
+          //   label: '在途状态',
+          //   align: 'center',
+          //   minWidth: 80
+          // },
           {
-            slot: 'currentColor',
-            prop: 'currentStatus',
-            label: '在途状态',
-            align: 'center',
-            minWidth: 80
-          },
-          {
-            slot: 'finishCount',
-            prop: 'finishCount',
             label: '最终缺料数量',
             align: 'center',
-            minWidth: 80
+            minWidth: 80,
+            formatter: (row) => {
+              let total =
+                row.demandQuantity - row.inTransitNum - row.inventoryQuantity;
+              if (total < 0) {
+                return 0;
+              }
+              return total;
+            }
           },
           {
             slot: 'finishColor',
@@ -213,7 +261,7 @@
             label: '最终状态',
             align: 'center',
             minWidth: 80
-          },
+          }
         ],
         ids: [],
         leftShow: false,
@@ -222,16 +270,17 @@
         cardList: [],
         treeProps: {
           label: 'code',
-          children: 'children',
+          children: 'children'
         },
         planInfo: {
-          salesCode: '',
+          salesCode: ''
         },
+        datasourceList: []
       };
     },
     watch: {
-      leftShow(newVal, oldVal){
-        if(newVal){
+      leftShow(newVal, oldVal) {
+        if (newVal) {
           this.leftWidth = '15%';
           this.rightWidth = '85%';
         } else {
@@ -240,11 +289,10 @@
         }
       }
     },
-    mounted() {
-    },
+    mounted() {},
     methods: {
-      handleNodeClick(data){
-        this.reload({planIds: [data.id]});
+      handleNodeClick(data) {
+        this.reload({ planIds: [data.id] });
       },
       reload(where) {
         this.$nextTick(() => {
@@ -252,42 +300,69 @@
         });
       },
       /* 表格数据源 */
-      datasource({ page, limit, where }) {
-        return homogeneityInspect({
-          pageNum: page,
-          size: limit,
-          ...where,
-        });
+      // datasource({ page, limit, where }) {
+      //   return homogeneityInspect({
+      //     pageNum: page,
+      //     size: limit,
+      //     ...where
+      //   });
+      // },
+      stockDetail(row) {
+        this.$refs.stockDetailDialog.open(row);
       },
-       stockDetail(row) {
-         this.$refs.stockDetailDialog.open(row);
-       },
-       currentDetail(row) {
-         this.$refs.currentDetailDialog.open(row);
-       },
-      open(dataList) {
-         this.visible = true;
-         this.cardList = dataList || [];
-         for(let item of this.cardList){
-           let children = [];
-           if(item.salesCode){
-
-             for(let ele of item.salesCode){
-               children.push({code: ele, id: item.id});
-             }
-           }
-           item.children = children;
-         }
-         this.planInfo = dataList.length > 0 ? dataList[0] : null;
-         console.log(this.planInfo);
-         if(dataList.length > 1){
-           this.leftShow = true;
-         } else {
-           this.leftShow = false;
-         }
-         if(this.planInfo){
-           this.reload({planIds: [this.planInfo.id]});
-         }
+      currentDetail(row) {
+        this.$refs.currentDetailDialog.open(row);
+      },
+      async open(dataList) {
+        this.visible = true;
+        try {
+          let data = dataList[0];
+          const res = await findBomCategoryByCategoryId(data.categoryId);
+          let obj = {};
+          res.map((el) => {
+            let OBMINFO = {
+              bomId: el.bomId,
+              bomType: el.type,
+              versions: `V${el.versions}.0`
+            };
+            if (obj[el.bomType]) {
+              obj[el.bomType].bomList.push(OBMINFO);
+            } else {
+              obj[el.bomType] = { ...el, bomList: [OBMINFO] };
+            }
+          });
+          console.log(obj,'obj ++++++++++')
+          console.log(res, '版本 类型');
+          let params = {
+            planId: data.id
+          };
+          const result = await findMaterialInfoByPlanId(params);
+          console.log(result, 'result +++++');
+          this.datasourceList = result;
+        } catch (err) {
+          this.$message.error(err.message);
+        }
+        return;
+        this.cardList = dataList || [];
+        for (let item of this.cardList) {
+          let children = [];
+          if (item.salesCode) {
+            for (let ele of item.salesCode) {
+              children.push({ code: ele, id: item.id });
+            }
+          }
+          item.children = children;
+        }
+        this.planInfo = dataList.length > 0 ? dataList[0] : null;
+        console.log(this.planInfo);
+        if (dataList.length > 1) {
+          this.leftShow = true;
+        } else {
+          this.leftShow = false;
+        }
+        if (this.planInfo) {
+          this.reload({ planIds: [this.planInfo.id] });
+        }
       },
       cancel() {
         this.formData = {};
@@ -297,11 +372,11 @@
       confirm() {
         this.visible = false;
       },
-      async merge(){
-        this.reload({planIds: this.ids, productType: 1, merge: 2});
+      async merge() {
+        this.reload({ planIds: this.ids, productType: 1, merge: 2 });
       },
-      tabClick(){
-        this.reload({planIds: this.ids, productType: 1});
+      tabClick() {
+        this.reload({ planIds: this.ids, productType: 1 });
       }
     }
   };
@@ -320,17 +395,16 @@
     justify-content: flex-end;
     padding-bottom: 3px;
   }
-  .statusRed{
+  .statusRed {
     color: red;
   }
-  .planInfo{
-
+  .planInfo {
   }
-  .form-wrapper{
+  .form-wrapper {
     display: flex;
   }
-  .planInfo{
-    display: flex;
+  .planInfo {
+    // display: flex;
     font-size: 16px;
   }
 </style>

src/views/saleOrder/components/order-search.vue

@@ -597,7 +597,25 @@
           }
         }
         const list = [];
+        let startTime = '';
+        let endTime = '';
         this.selection.map((item) => {
+          if (!startTime) {
+            startTime = item.releaseTime;
+          } else {
+            startTime =
+              this.compareTimes(startTime, item.releaseTime) == 1
+                ? item.releaseTime
+                : startTime;
+          }
+          if (!endTime) {
+            endTime = item.deliveryTime;
+          } else {
+            endTime =
+              this.compareTimes(endTime, item.deliveryTime) == 2
+                ? item.deliveryTime
+                : endTime;
+          }
           list.push(item.id);
         });
         this.$router.push({
@@ -608,11 +626,25 @@
             produceRoutingName: this.selection[0].produceRoutingName,
             factoriesId: factoriesId,
             bomCategoryId: bomCategoryId,
-            produceType: produceType
+            produceType: produceType,
+            startTime,
+            endTime
           }
         });
       },
+      // 比较时间大小
+      compareTimes(timeStr1, timeStr2) {
+        // 将时间字符串转换为Date对象
+        // 注意：需要将空格替换为'T'以符合ISO格式，或者直接按格式解析
+        const date1 = new Date(timeStr1.replace(' ', 'T'));
+        const date2 = new Date(timeStr2.replace(' ', 'T'));
 
+        if (date1 > date2) {
+          return 1;
+        } else {
+          return 2;
+        }
+      },
       // 刷新订单
       orderRefresh() {
         this.loading = true;

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -334,6 +334,13 @@
               {{ scope.row.productSumWeight }} {{ form.weightUnit }}
             </template>
           </el-table-column>
+          <el-table-column
+            label="下达时间"
+            align="center"
+            prop="releaseTime"
+            width="170"
+          >
+          </el-table-column>
           <el-table-column label="规格" align="center" prop="specification">
           </el-table-column>
           <el-table-column
@@ -863,6 +870,13 @@
       },
       'form.produceType'(newVal, oldVal) {
         console.log(newVal, '值');
+      },
+      form: {
+        handler(newVal) {
+          console.log(newVal, 'newVal 33');
+        },
+        deep: true,
+        immediate: true
       }
     },
     mounted() {
@@ -904,6 +918,18 @@
     },
 
     methods: {
+      // 初始化时间赋值
+      initTime() {
+        let data = this.$route.query;
+        if (data.startTime) {
+          this.$set(this.form, 'startTime', data.startTime);
+        }
+        if (data.endTime) {
+          this.$set(this.form, 'endTime', data.endTime);
+        }
+        console.log(data, '000000000000000000000 参数');
+        console.log(this.form, 'form 的赋值');
+      },
       // 是否必填
       mandatoryField() {
         parameterGetByCode({
@@ -938,6 +964,7 @@
         console.log(data, '订单的data');
 
         this.form = data;
+        this.initTime();
         // if (data.startTime) {
         //   this.form.startTime = new Date(data.startTime);
         // }
@@ -1079,6 +1106,7 @@
         productionToPlan(params).then((res) => {
           console.log(res, 'resresres');
           this.form = deepClone(res);
+          this.initTime();
           this.bomListVersion();
 
           console.log(this.bomVersionList, 'this.bomVersionList');

src/views/workOrder/index.vue

@@ -388,7 +388,7 @@
             minWidth: 220,
             sortable: true
           },
-          {
+           {
             prop: 'taskName',
             action: 'taskName',
             label: '工序进度',

src/views/workOrder/mixins/release.js

@@ -85,7 +85,8 @@ export default {
         this.FirstTaskIdFn(); // 查询工位数据
       } else {
         this.$message.warning(
-          `${this.current.firstTaskName}工序没有工作中心,请到主数据工序管理维护工序信息!`
+          // `${this.current.firstTaskName}工序没有工作中心,请到主数据工序管理维护工序信息!`
+          `当前登录人不属于首工序所属工作中心及班组，请切换首工序${this.current.firstTaskName}所在的班组成员派单`
         );
       }
     },