From bff063717f8d191bd1ac3ab2804f7614f0a2b39d Mon Sep 17 00:00:00 2001
From: MrZhai <zrhdyxa@163.com>
Date: Thu, 10 Mar 2022 11:39:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=8F=91=E7=A5=A8=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=202.=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/StockOrderDetailController.java     | 19 +++++++++++++++++--
 .../entity/inout/StockOrderDetailEntity.java  | 12 ++++++++++++
 .../mybatis/mapper/inout/StockOrderDetail.xml |  5 ++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
index 0853915..0019f75 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java
@@ -248,8 +248,8 @@ public class StockOrderDetailController {
 
         List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
         List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
-        if(stockOrderIdsRequest.getDatas()== null && stockOrderIdsRequest.getDatas().size()<1){
-            return ResultVOUtils.error(500,"未选择产品！");
+        if (stockOrderIdsRequest.getDatas() == null && stockOrderIdsRequest.getDatas().size() < 1) {
+            return ResultVOUtils.error(500, "未选择产品！");
         }
         for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) {
             CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
@@ -554,4 +554,19 @@ public class StockOrderDetailController {
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }
+
+
+    /**
+     * 更新单据详情信息
+     *
+     * @param stockOrderDetailEntities
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/stock/order/detail/update")
+    public BaseResponse updateStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity) {
+        if (null != stockOrderDetailEntity)
+            stockOrderDetailService.updateById(stockOrderDetailEntity);
+        return ResultVOUtils.success("更新成功");
+    }
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java
index d7acdb4..0872f62 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderDetailEntity.java
@@ -22,4 +22,16 @@ public class StockOrderDetailEntity {
     private String zczbhhzbapzbh;
     private BigDecimal price;
 
+    //销售清单号（第二票）
+    private String secSalesListNo;
+
+    //销售发票号（第一票）
+    private String firstSalesInvNo;
+
+    //销售发票号（第二票）
+    private String secSalesInvNo;
+
+    //开票日期
+    private String invoiceDate;
+
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml
index ec3c95e..8b4f636 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml
@@ -116,7 +116,10 @@
             <if test="count != null">count=#{count},</if>
             <if test="reCount != null">reCount=#{reCount},</if>
             <if test="price != null">price=#{price},</if>
-
+            <if test="secSalesListNo != null != null">secSalesListNo=#{secSalesListNo},</if>
+            <if test="firstSalesInvNo != null">firstSalesInvNo=#{firstSalesInvNo},</if>
+            <if test="secSalesInvNo != null">secSalesInvNo=#{secSalesInvNo},</if>
+            <if test="invoiceDate != null">invoiceDate=#{invoiceDate},</if>
         </set>
         WHERE id = #{id}
     </update>