From 0abf25ad1c0aee905dbf87d3e33006d5e6afa754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Sun, 25 Jun 2023 17:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PurchaseorderitemServiceImpl.java   |  2 +-
 .../mapper/purchaseorder/PurchaseorderMapper.xml     |  2 +-
 .../views/scm/basicInformation/arinvoices/Form.vue   |  9 ++++++++-
 .../views/scm/basicInformation/collection/Form.vue   |  9 ++++++++-
 .../basicInformation/poundlist/PurchaseOrderForm.vue |  9 ++++++++-
 .../scm/basicInformation/poundlist/salesForm.vue     |  9 ++++++++-
 .../scm/basicInformation/purchaseorder/Form.vue      |  9 ++++++++-
 .../basicInformation/purchaseorder/InvoicesForm.vue  | 12 ++++++++++--
 .../basicInformation/purchaseorder/receiptinForm.vue |  9 ++++++++-
 .../views/scm/basicInformation/receiptin/Form.vue    |  9 ++++++++-
 .../views/scm/basicInformation/receiptout/Form.vue   |  9 ++++++++-
 .../views/scm/basicInformation/saleorder/Form.vue    |  9 ++++++++-
 .../basicInformation/saleorder/arinvoicesForm.vue    |  9 ++++++++-
 .../basicInformation/saleorder/receiptoutForm.vue    |  9 ++++++++-
 14 files changed, 100 insertions(+), 15 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index 08af46f5..c50f91f6 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -974,7 +974,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 
             // 任务集合
-            if (StringUtil.isNotNull(userInfo.getOrganizeId()) && userInfo.getOrganizeId().equals("400882911877923205")) {
+            if (StringUtil.isNotNull(userInfo.getOrganizeId()) && userInfo.getOrganizeId().equals("395545258156429509")) {
                 // 子线程计数器
                 CountDownLatch countDownLatch = new CountDownLatch(5);
                 // 创建线程池
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
index 199c5577..776071a9 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
@@ -129,7 +129,7 @@
                                 3 ELSE 13
                             END
                         ) AS `rate`,
-                    ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END  ),0), 4 ) AS `price`,
+                    ROUND(IFNULL( SUM(d.amount)/SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END  ),0), 6 ) AS `price`,
                     ROUND( SUM( CASE b.unit WHEN 0 THEN b.settlement ELSE b.settlement/1000 END  ), 2 ) AS `settlement`,
                     ( CASE b.unit WHEN 0 THEN '吨' ELSE '千克' END ) AS `unit`,
                     ROUND( a.amount, 2 ) `amount`
diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
index fee34e49..1f84660f 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
@@ -17,7 +17,7 @@
             </el-col>
             <el-col :span="8" >
                 <el-form-item  label="业务日期"
- prop="businessDate" required>
+ prop="businessDate" >
                     <el-date-picker    v-model="dataForm.businessDate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
 
@@ -370,6 +370,13 @@
                             activezbtwpv:'0',
             rules:
             {
+              businessDate: [
+                {
+                  required: true,
+                  message: '业务日期不能为空',
+                  trigger: 'blur'
+                },
+              ],
             },
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                         statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 703fb57f..bc0ff70f 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -83,7 +83,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -292,6 +292,13 @@
               trigger: 'change'
             },
           ],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
         },
         customerNamecolumnOptions: [{
           "label": "客户编码",
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
index 5284b265..63fa5669 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue
@@ -89,7 +89,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -641,6 +641,13 @@
             message: '请选择',
             trigger: 'change'
           }, ],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
         },
         contractCodecolumnOptions: [{
           "label": "合同编码",
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 9dc26029..6a9a5efb 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -125,7 +125,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -792,6 +792,13 @@
             //             trigger: 'change'
             //         },
             // ],
+            businessDate: [
+              {
+                required: true,
+                message: '业务日期不能为空',
+                trigger: 'blur'
+              },
+            ],
           },
         contractCodecolumnOptions: [{ 'label': '合同编码', 'value': 'contract_code' }, {
           'label': '合同名称',
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
index d29366ad..098e41b5 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
@@ -93,7 +93,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -623,6 +623,13 @@
             message: '请选择',
             trigger: 'change'
           }, ],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
         },
         contractCodecolumnOptions: [{
           "label": "合同编码",
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
index 3ed5af93..940ac18a 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
@@ -12,7 +12,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务日期" prop="businessDate" required>
+            <el-form-item label="业务日期" prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
                 type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -350,7 +350,15 @@
           invoicesitem0List: [],
         },
         activebzsrnx: '0',
-        rules: {},
+        rules: {
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
+        },
         invoiceTypeOptions: [{
           "fullName": "普通增值税发票",
           "id": "1"
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
index 504b2f61..5ae4b92b 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
@@ -86,7 +86,7 @@
 						</el-form-item>
 					</el-col>
           <el-col :span="8">
-            <el-form-item label="业务日期" prop="businessDate" required>
+            <el-form-item label="业务日期" prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -363,6 +363,13 @@
             message: '请选择',
             trigger: 'change'
           }],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
         },
 				typeOptions: [{
 					"fullName": "采购入库",
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
index 29fd48e1..f0a1612e 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
@@ -86,7 +86,7 @@
 						</el-form-item>
 					</el-col>
           <el-col :span="8">
-            <el-form-item label="业务日期" prop="businessDate" required>
+            <el-form-item label="业务日期" prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择业务日期" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -324,6 +324,13 @@
             message: '请选择',
             trigger: 'change'
           }],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
         },
 				typeOptions: [{
 					"fullName": "采购入库",
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index ba74cc0c..4f07969c 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -77,7 +77,7 @@
 					</el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -301,6 +301,13 @@
 						message: '请至少选择一个',
 						trigger: 'change'
 					}, ],
+          businessDate: [
+            {
+              required: true,
+              message: '业务日期不能为空',
+              trigger: 'blur'
+            },
+          ],
 				},
 				typeOptions: [{
 					"fullName": "销售出库",
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index 22bd0b2f..ed6150fb 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -124,7 +124,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="remark" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -733,6 +733,13 @@
                 trigger: 'change'
               },
             ],
+            businessDate: [
+              {
+                required: true,
+                message: '业务日期不能为空',
+                trigger: 'blur'
+              },
+            ],
           },
         contractCodecolumnOptions: [{"label": "合同编码", "value": "contract_code"}, {
           "label": "合同名称",
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
index 3bd423e9..7d86896c 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
@@ -17,7 +17,7 @@
             </el-col>
             <el-col :span="8" >
                 <el-form-item  label="业务日期"
- prop="businessDate" required>
+ prop="businessDate" >
                     <el-date-picker    v-model="dataForm.businessDate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
 
@@ -380,6 +380,13 @@
                             activezbtwpv:'0',
             rules:
             {
+              businessDate: [
+                {
+                  required: true,
+                  message: '业务日期不能为空',
+                  trigger: 'blur'
+                },
+              ],
             },
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                         statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
index 092b1ab4..875c8234 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
@@ -87,7 +87,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务日期"
-                          prop="businessDate" required>
+                          prop="businessDate" >
               <el-date-picker v-model="dataForm.businessDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp" >
 
@@ -319,6 +319,13 @@
                 trigger: 'change'
               },
             ],
+            businessDate: [
+              {
+                required: true,
+                message: '业务日期不能为空',
+                trigger: 'blur'
+              },
+            ],
           },
         typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
         salesIdcolumnOptions: [{"label": "单据编号", "value": "document_no"}, {