From ebe563f0fcaa739b80c29ea5982a9d7642324b1f Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 27 Dec 2022 16:26:10 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=97=A5=E8=AE=A1=E5=88=92=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pdm/service/impl/DailyplanServiceImpl.java  |  4 +++-
 .../src/views/wms/pdm/produce/dailyplan/AddDialog.vue  | 10 +++++-----
 mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue   |  7 +++++++
 .../src/views/wms/pdm/produce/workorder/ViewDialog.vue | 10 +++++-----
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
index 3b3bfd44..23aec10e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
@@ -297,7 +297,7 @@ public class DailyplanServiceImpl implements DailyplanService {
         json.put("plan_org_name", product.getString("org_name"));
 
         json.put("product_series", json.getString("product_series_id"));
-
+        json.put("is_out",ObjectUtil.isNotEmpty(json.get("send_date"))?"1":"0");
         MPS_BD_ProductDailyPlan.insert(json);
     }
 
@@ -348,6 +348,7 @@ public class DailyplanServiceImpl implements DailyplanService {
         whereJson.put("plan_org_name", product.getString("org_name"));
 
         whereJson.put("product_series", whereJson.getString("product_series_id"));
+        whereJson.put("is_out",ObjectUtil.isNotEmpty(whereJson.get("send_date"))?"1":"0");
         MPS_BD_ProductDailyPlan.update(whereJson);
 
     }
@@ -427,6 +428,7 @@ public class DailyplanServiceImpl implements DailyplanService {
 
             new_jo.put("org_id",jo.getString("org_id"));
             new_jo.put("is_experiment","0");
+            new_jo.put("is_out",ObjectUtil.isNotEmpty(new_jo.get("send_date"))?"1":"0");
             workOrdereService.create(new_jo);
         }
     }
diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue
index 95560254..ab4cc5c3 100644
--- a/mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue
+++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue
@@ -97,11 +97,11 @@
             :value="item.id"
           /></el-select>
       </el-form-item>
-      <el-form-item label="是否外协" prop="is_out">
-        <label slot="label">是否外协:</label>
-        <el-radio v-model="form.is_out" label="1" >是</el-radio>
-        <el-radio v-model="form.is_out" label="0" >否</el-radio>
-      </el-form-item>
+<!--      <el-form-item label="是否外协" prop="is_out">-->
+<!--        <label slot="label">是否外协:</label>-->
+<!--        <el-radio v-model="form.is_out" label="1" >是</el-radio>-->
+<!--        <el-radio v-model="form.is_out" label="0" >否</el-radio>-->
+<!--      </el-form-item>-->
       <el-form-item label="发货日期" prop="send_date">
         <el-date-picker v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" :disabled="crud.status.view > 0" />
       </el-form-item>
diff --git a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
index 795a2bda..cac5dc84 100644
--- a/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
@@ -206,6 +206,13 @@
         <el-table-column prop="create_time" label="创建时间" min-width="135" />
         <el-table-column prop="create_name" label="创建人"  min-width="60" />
         <el-table-column prop="remark" label="备注" min-width="200"  />
+        <el-table-column prop="is_out" min-width="80" label="是否外协">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_out==='1'">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="send_date" min-width="120" label="发货日期" />
       </el-table>
     </div>
     <AddDialog @AddChanged="querytable" />
diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue
index 8e6a3068..5e73ddee 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue
@@ -70,11 +70,11 @@
       <el-form-item label="发货日期" prop="send_date">
         <el-date-picker disabled v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" />
       </el-form-item>
-      <el-form-item label="是否外协" prop="is_out">
-        <label slot="label">是否外协:</label>
-        <el-radio v-model="form.is_out" label="1" disabled>是</el-radio>
-        <el-radio v-model="form.is_out" label="0" disabled>否</el-radio>
-      </el-form-item>
+<!--      <el-form-item label="是否外协" prop="is_out">-->
+<!--        <label slot="label">是否外协:</label>-->
+<!--        <el-radio v-model="form.is_out" label="1" disabled>是</el-radio>-->
+<!--        <el-radio v-model="form.is_out" label="0" disabled>否</el-radio>-->
+<!--      </el-form-item>-->
       <el-form-item label="生产批次" prop="pcsn">
         <label slot="label">生产批次:</label>
         <el-input v-model.trim="form.pcsn" style="width: 210px" disabled />