From e8b3a3d2b6fb40974354787a5a32e47a2615a6aa Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Thu, 4 Jul 2024 17:25:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/scm/WarehousingOutboundMapper.xml  |   4 +-
 .../jnpf/controller/VoucherController.java    |  17 ++-
 .../jnpf/entity/WarehousingProductEntity.java |   3 +
 .../WarehousingProductModel.java              |   4 +
 .../publicPopup/NotificationVoucherSale.vue   |   4 +
 .../saleCenter/saleOutBoundNotice/form.vue    |  18 ++-
 .../warehousing/warehousingoutbound/form.vue  | 112 ++++++++++--------
 7 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
index 4e4c7374..e9d60587 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
@@ -52,9 +52,9 @@
         WHEN '11' THEN
         '采购发货单出库'
         WHEN '12' THEN
-        '调拨出库撤回'
-        WHEN '13' THEN
         '销售发货单出库'
+        WHEN '13' THEN
+        '调拨出库撤回'
         WHEN '15' THEN
         '采购收货单入库'
         WHEN '16' THEN
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
index 8fac751c..ab3c3227 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
@@ -1504,11 +1504,18 @@ public class VoucherController {
             columns.add(new ExcelImFieldModel("tableField140","",tableField140columns));*/
             for (VoucherExcelVO222 voucherExcelVO222:excelDataList){
                 try {
-                    String a= String.valueOf(voucherExcelVO222.getPoundlistTime());
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                    Date date = new Date(a);
-                    String formattedDate = sdf.format(date);
-                    voucherExcelVO222.setReceivingDate(formattedDate);
+                    if (voucherExcelVO222.getPoundlistTime()==null){
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = new Date();
+                        String formattedDate = sdf.format(date);
+                        voucherExcelVO222.setReceivingDate(formattedDate);
+                    }else {
+                        String a= String.valueOf(voucherExcelVO222.getPoundlistTime());
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = new Date(a);
+                        String formattedDate = sdf.format(date);
+                        voucherExcelVO222.setReceivingDate(formattedDate);
+                    }
                 }catch (Exception e){
                     e.printStackTrace();
                     return ActionResult.fail("收货日期格式不对，请输入/。或是有多余的行");
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java
index a0aa7464..746eb807 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java
@@ -89,6 +89,9 @@ public class WarehousingProductEntity  {
     @TableField("ORDER_LINE")
     private String orderLine;
 
+    @TableField("INVENTORY_NUMBER")
+    private BigDecimal inventoryNumber;
+
 
     @TableField(exist = false)
     private String storageUnit;
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java
index 8e4054cd..e37ec3fc 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/warehousingnotification/WarehousingProductModel.java
@@ -72,4 +72,8 @@ public class WarehousingProductModel  {
     @JSONField(name = "ordLn")
     private String ordLn;
 
+    /** 库存数量 **/
+    @JSONField(name = "inventoryNumber")
+    private String inventoryNumber;
+
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue
index df0b7ae9..39bb3d20 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue
@@ -36,6 +36,10 @@
       </el-table-column>
       <el-table-column prop="poundCode" label="磅单编号" align="left">
       </el-table-column>
+      <el-table-column prop="batchNo" label="批次号" align="left">
+      </el-table-column>
+      <el-table-column prop="inventoryNumber" label="库存数量" align="left">
+      </el-table-column>
       <!-- <el-table-column prop="vehicleName" label="车牌号" align="left">
       </el-table-column>
       <el-table-column prop="supplierName" label="供应商名字" align="left">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
index da3d8029..234e7ba8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
@@ -568,6 +568,20 @@
                   </template>
                 </el-table-column>
 
+                <el-table-column label="库存数量" v-if="judgeShow('warehousingproduct-inventoryNumber')"
+                  prop="inventoryNumber" width="200">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingproductList-inventoryNumber')">*</span>库存数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.inventoryNumber" @change="
+                        changeData('warehousingproduct-inventoryNumber', scope.$index)
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+
                 <el-table-column label="生产日期" v-if="judgeShow('warehousingproduct-produceDate')"
                   prop="produceDate" width="180">
                   <template slot="header">
@@ -906,14 +920,14 @@ export default {
           this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
           this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
           this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date
-          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
+          this.dataForm.warehousingProductList[idx].inventoryNumber = val2[0].inventory_number
         } else {
           let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index]))
           this.createwarehousingproductList(item)
           this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId
           this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number
           this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date
-          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
+          this.dataForm.warehousingProductList[idx].inventoryNumber = val2[i].inventory_number
         }
         idx++
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
index ef5e699d..f303e18b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
@@ -360,10 +360,10 @@
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
 
-              <div class="table-actions" @click="choice(dataForm.warehousingId)"
+              <!-- <div class="table-actions" @click="choice(dataForm.warehousingId)"
                 v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              </div> -->
 
             </jnpf-form-tip-item>
           </el-col>
@@ -495,6 +495,23 @@
 
                 </el-table-column>
 
+                <el-table-column label="库存数量"
+                  v-if="judgeShow('warehousingoutboundproduct-inventoryNumber')"
+                  prop="inventoryNumber" width="200" align="center">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingoutboundproductList-inventoryNumber')">*</span>库存数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.inventoryNumber"
+                      @change="changeData('warehousingoutboundproduct-inventoryNumber', scope.$index)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-inventoryNumber')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+
                 <!-- <el-table-column label="批次号"
                   v-if="judgeShow('warehousingoutboundproduct-batchNumber')" prop="batchNumber"
                   width="200px">
@@ -777,9 +794,10 @@ export default {
             spec: e.spec,
             inventoryUnitId: e.inventoryUnitId,
             outboundUnit: e.inventoryUnitId,
-            outboundNumber: e.purchaseNum,
+            outboundNumber: e.notificationStorageNumber,
             outboundAreaId: e.storageAreaId,
             batchNumber: e.batchNo,
+            inventoryNumber: e.inventoryNumber,
             storageNumber: e.storageNumber,
             receivedQuantity: e.receivedQuantity,
             businessPrice: e.businessPrice,
@@ -921,56 +939,56 @@ export default {
           }
         }
       }
-      if (!this.warehousingoutboundpoundlistExist()) return
+      // if (!this.warehousingoutboundpoundlistExist()) return
       if (!this.warehousingoutboundproductExist()) return
-      if (!this.warehousingoutboundproductExist1()) return
+      // if (!this.warehousingoutboundproductExist1()) return
 
       return isOk
     },
-    warehousingoutboundpoundlistExist() {
-      let isOk = true;
-      for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) {
-        const e = this.dataForm.warehousingOutboundPoundlistList[i];
-        if (!e.voucherId) {
-          this.$message({
-            message: '关联凭证不能为空',
-            type: 'error',
-            duration: 1000
-          });
-          isOk = false
-          break
-        }
-      }
-      return isOk;
-    },
+    // warehousingoutboundpoundlistExist() {
+    //   let isOk = true;
+    //   for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) {
+    //     const e = this.dataForm.warehousingOutboundPoundlistList[i];
+    //     if (!e.voucherId) {
+    //       this.$message({
+    //         message: '关联凭证不能为空',
+    //         type: 'error',
+    //         duration: 1000
+    //       });
+    //       isOk = false
+    //       break
+    //     }
+    //   }
+    //   return isOk;
+    // },
 
-    warehousingoutboundproductExist1() {
-      let isOk = true;
-      var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList))
-      var echararr = [];
-      for (var i = 0; i < data.length; i++) {
-        var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
-        if (arrindex == -1) {
-          echararr.push(data[i]);
-        } else {
-          echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
-        }
-      }
-      echararr.forEach(item => {
+    // warehousingoutboundproductExist1() {
+    //   let isOk = true;
+    //   var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList))
+    //   var echararr = [];
+    //   for (var i = 0; i < data.length; i++) {
+    //     var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
+    //     if (arrindex == -1) {
+    //       echararr.push(data[i]);
+    //     } else {
+    //       echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
+    //     }
+    //   }
+    //   echararr.forEach(item => {
 
-        const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight)
-        if (!flag) {
-          this.$message({
-            message: '凭证与商品不一致',
-            type: 'error',
-            duration: 1000
-          });
-          isOk = false
-          return isOk
-        }
-      })
-      return isOk
-    },
+    //     const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight)
+    //     if (!flag) {
+    //       this.$message({
+    //         message: '凭证与商品不一致',
+    //         type: 'error',
+    //         duration: 1000
+    //       });
+    //       isOk = false
+    //       return isOk
+    //     }
+    //   })
+    //   return isOk
+    // },
 
     warehousingoutboundproductExist() {
       let isOk = true;

From 2fe8e4cb1e79ddb0e16d9137ff10cef56ee805dd Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Thu, 4 Jul 2024 17:43:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehousing/warehousingoutbound/form.vue  | 67 ++-----------------
 1 file changed, 6 insertions(+), 61 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
index f303e18b..1c60ac25 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
@@ -150,7 +150,7 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <div style="padding:15px 0px">
               <span style="color: #409EFF;">▋</span>
               <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">出库凭证</span>
@@ -160,27 +160,6 @@
             <jnpf-form-tip-item label-width="0">
               <el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border>
                 <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
-                <!-- <el-table-column label="关联凭证" min-width="150px"
-                  v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId"
-                  align="center" width="220" fixed="left">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingoutboundpoundlistList-voucherId')">*</span>关联凭证
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.warehousingoutboundpoundlistvoucherId"
-                      placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
-                      popupTitle="选择数据" popupType="dialog" relationField='voucher_code'
-                      :field="'voucherId' + scope.$index" interfaceId="529929122277773509"
-                      :pageSize="20"
-                      :columnOptions="warehousingoutboundpoundlistvoucherIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
-                    </JnpfPopupSelect>
-                  </template>
-                </el-table-column> -->
-
                 <el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
                   <template slot="header">
                     <span class="required-sign"></span>关联凭证
@@ -191,7 +170,6 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-
                 <el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
                   <template slot="header">
                     <span class="required-sign"></span>单据类型
@@ -212,31 +190,9 @@
                       :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
-                </el-table-column>
-
-                <!-- <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"></span>磅单编号
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
-                      :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-
-                <!-- <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"></span>磅单时间
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.poundlistTime" placeholder="请输入" disabled
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
                 </el-table-column> -->
 
-                <el-table-column label="磅单时间"
+          <!-- <el-table-column label="磅单时间"
                   v-if="judgeShow('warehousingoutboundpoundlist-poundlistTime')"
                   prop="poundlistTime" width="200" align="center">
                   <template slot="header">
@@ -336,17 +292,6 @@
                   </template>
                 </el-table-column>
 
-                <!-- <el-table-column label="备注" prop="remark" align="center" width="150">
-                  <template slot="header">
-                    <span class="required-sign"></span>备注
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.remark" placeholder="请输入" disabled clearable
-                      :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column> -->
-
                 <el-table-column label="操作" width="50" align="center" fixed="right"
                   v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                   <template slot-scope="scope">
@@ -354,18 +299,18 @@
                       @click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button>
                   </template>
                 </el-table-column>
-              </el-table>
-              <!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()"
+              </el-table> -->
+          <!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()"
                 v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
 
-              <!-- <div class="table-actions" @click="choice(dataForm.warehousingId)"
+          <!-- <div class="table-actions" @click="choice(dataForm.warehousingId)"
                 v-if="!judgeWrite('warehousingoutboundpoundlistList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div> -->
 
-            </jnpf-form-tip-item>
+          </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
             <div style="padding:15px 0px">

From 2d0214ac68dbf3c551dd8a0bae3efc292b69bf20 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Thu, 4 Jul 2024 18:01:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehousing/warehousingoutbound/form.vue    | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
index 1c60ac25..ba8f9fba 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/form.vue
@@ -440,23 +440,6 @@
 
                 </el-table-column>
 
-                <el-table-column label="库存数量"
-                  v-if="judgeShow('warehousingoutboundproduct-inventoryNumber')"
-                  prop="inventoryNumber" width="200" align="center">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('warehousingoutboundproductList-inventoryNumber')">*</span>库存数量
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.inventoryNumber"
-                      @change="changeData('warehousingoutboundproduct-inventoryNumber', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingoutboundproductList') || judgeWrite('warehousingoutboundproductList-inventoryNumber')"
-                      clearable :style='{ "width": "100%" }'>
-                    </JnpfInput>
-                  </template>
-                </el-table-column>
-
                 <!-- <el-table-column label="批次号"
                   v-if="judgeShow('warehousingoutboundproduct-batchNumber')" prop="batchNumber"
                   width="200px">

From 2018b2f9b866e2d93817c487e96d3649fe7d694f Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Fri, 5 Jul 2024 12:42:39 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/scm/WorkOrderMapper.xml  | 76 ++++++++++++++-----
 .../java/jnpf/mapper/WorkOrderMapper.java     |  4 +-
 .../java/jnpf/service/WorkOrderService.java   |  4 +-
 .../service/impl/WorkOrderServiceImpl.java    |  9 ++-
 .../jnpf/controller/WorkOrderController.java  |  6 +-
 5 files changed, 76 insertions(+), 23 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
index 458d5ed5..f4eb5801 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
@@ -151,37 +151,31 @@
 
     </select>
     
-    <select id="queryWorkOrderByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
+    <select id="queryWorkOrderProductByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
         select
             a.id as ID,
             m.yunguan_value as ORGANIZATION_CODE,
             l.f_full_name as ORGANIZATION_NM,
             a.code as TASK_NO,
-            case
-                a.type
-            when '1' then '产出'
-            when '2' then '投入'
-            when '3' then '投入'
-            end as PRD_TY,
+            '产出' as PRD_TY,
             d.code as ITEM_CD,
             d.name as ITEM_NM,
             case
-                d.inventory_type
-            when '1' then '原料'
+                d.is_input
+            when '1' then '产品'
             when '2' then '副产品'
-            when '3' then '产品'
             end as PROD_TY,
-            d.spec as SPEC_TYPE,
+            b.spec as SPEC_TYPE,
             b.proportion_num as QUANTITY,
             a.work_time as PRD_DATE,
             b.unit_id as UOM,
             'N' as ERP_FLAG,
-            e.name as STORE_ID,
+            n.cargo_name as STORE_ID,
             '正向' as RSLT_TYPE,
             a.code as TASK_NM,
-            g.batch_number as BATCH_ID,
+            b.batch_number as BATCH_ID,
             '已完成' as STATUS_FLAG,
-            a.business_id as ATTR1,
+            e.name as ATTR1,
             k.code as ATTR2,
             k.name as ATTR3,
             h.f_real_name as CREATE_EMP_ID,
@@ -193,10 +187,9 @@
             null as ESB_DTM,
             '' as ESB_MESSAGE
         from jg_work_order a
-        left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
-        left join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
+        right join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
         left join jg_product d on b.product_id = d.id and d.f_delete_mark is null
-        left join jg_business_line e on a.warehouse_id = e.id and e.f_delete_mark is null
+        left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
         left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
         left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
         left join base_user h on a.f_creator_user_id  = h.f_id and h.f_delete_mark is null
@@ -205,7 +198,56 @@
         left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
         left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
         left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
+        left join jg_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null
         where a.f_delete_mark is null and a.id =#{id}
     </select>
 
+    <select id="queryWorkOrderPrimaryByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
+        select
+            a.id as ID,
+            m.yunguan_value as ORGANIZATION_CODE,
+            l.f_full_name as ORGANIZATION_NM,
+            a.code as TASK_NO,
+            '投入' as PRD_TY,
+            d.code as ITEM_CD,
+            d.name as ITEM_NM,
+            '原料' as PROD_TY,
+            c.spec as SPEC_TYPE,
+            c.reality_num as QUANTITY,
+            a.work_time as PRD_DATE,
+            b.unit_id as UOM,
+            'N' as ERP_FLAG,
+            n.cargo_name as STORE_ID,
+            '正向' as RSLT_TYPE,
+            a.code as TASK_NM,
+            c.batch_number as BATCH_ID,
+            '已完成' as STATUS_FLAG,
+            e.name as ATTR1,
+            k.code as ATTR2,
+            k.name as ATTR3,
+            h.f_real_name as CREATE_EMP_ID,
+            a.f_creator_time as CREATE_DTM,
+            'N' as READ_FLAG,
+            null as READ_TIME,
+            '' as ERR_MESSAGE,
+            'N' as ESB_STATUS,
+            null as ESB_DTM,
+            '' as ESB_MESSAGE
+        from jg_work_order a
+                 left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
+                 right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
+                 left join jg_product d on a.product_id = d.id and d.f_delete_mark is null
+                 left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
+                 left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
+                 left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
+                 left join base_user h on a.f_creator_user_id  = h.f_id and h.f_delete_mark is null
+                 left join jg_bom i on b.bom_id = i.id and i.f_delete_mark is null
+                 left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
+                 left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
+                 left join base_organzie l on a.company_id = l.f_id and l.f_delete_mark is null
+                 left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null
+                 left join jg_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null
+             where a.f_delete_mark is null and a.id =#{id}
+    </select>
+
 </mapper>
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WorkOrderMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WorkOrderMapper.java
index 23842ef5..98fb6090 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WorkOrderMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WorkOrderMapper.java
@@ -40,5 +40,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
     //列表查询
     IPage<WorkOrderEntity> getWorkOrderList(@Param("page") Page<WorkOrderEntity> page, @Param("workOrderPagination") WorkOrderPagination workOrderPagination, @Param("ew") Wrapper<WorkOrderEntity> workOrderQueryWrapper);
     //运管生产加工接口
-    List<YunguanProductProcessModel> queryWorkOrderByYunguan(@Param("id") String id );
+    List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(@Param("id") String id );
+    //运管生产加工接口
+    List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(@Param("id") String id );
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WorkOrderService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WorkOrderService.java
index 67d11c6c..0e042e47 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WorkOrderService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WorkOrderService.java
@@ -55,5 +55,7 @@ public interface WorkOrderService extends IService<WorkOrderEntity> {
     List<WorkOrderEntity> getReceiveList(WorkOrderPagination workOrderPagination);
     List<WorkOrderEntity> getReceiveTypeList(WorkOrderPagination workOrderPagination,String dataType);
     //运管生产加工接口
-    List<YunguanProductProcessModel> queryWorkOrderByYunguan(@Param("id") String id );
+    List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(@Param("id") String id );
+    //运管生产加工接口
+    List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(@Param("id") String id );
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
index 408a39ff..4cab2293 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
@@ -920,7 +920,12 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
     @Override
-    public List<YunguanProductProcessModel> queryWorkOrderByYunguan(String id) {
-        return workOrderMapper.queryWorkOrderByYunguan(id);
+    public List<YunguanProductProcessModel> queryWorkOrderPrimaryByYunguan(String id) {
+        return workOrderMapper.queryWorkOrderPrimaryByYunguan(id);
+    }
+
+    @Override
+    public List<YunguanProductProcessModel> queryWorkOrderProductByYunguan(String id) {
+        return workOrderMapper.queryWorkOrderProductByYunguan(id);
     }
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
index 371d2955..65fb79dd 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
@@ -1161,8 +1161,10 @@ public class WorkOrderController {
                             }
 
                         }
-//                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderByYunguan(id);
-//                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
+//                        List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
+//                        List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
+//                        yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
+//                        JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
 //                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
 //
 //                        }