From 22e9da1ab3e2da05eb9255eff092f8675863ab42 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 23 Nov 2021 11:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=A4=E8=B4=A7=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=E5=9E=83=E5=9C=BE=E6=95=B0=E6=8D=AE=20,=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gaotao/modules/finishedProduct/dao/SapDao.java | 4 ++++
 .../finishedProduct/service/impl/PackingServiceImpl.java    | 5 ++++-
 src/main/resources/mapper/finishedProduct/SapDao.xml        | 6 ++++++
 .../resources/static/pda/js/productwarehouse/packingout.js  | 1 -
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/dao/SapDao.java b/src/main/java/com/gaotao/modules/finishedProduct/dao/SapDao.java
index c1a4c54..a6a5f88 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/dao/SapDao.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/dao/SapDao.java
@@ -1,9 +1,13 @@
 package com.gaotao.modules.finishedProduct.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface SapDao {
     void reomverNullData();
 
+    void updateOnnmAutoKey(@Param("sapNo") Long sapNo);
+
+    void updateNNM1NextNumber(@Param("sapNo")Long sapNo);
 }
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
index 8ed390a..294f5e8 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/PackingServiceImpl.java
@@ -246,9 +246,12 @@ public class PackingServiceImpl implements PackingService {
                 log.info("sap业务处理失败:{}", msg);
                 throw new RuntimeException(msg);
             } else {
-                String sapNo = map.get("DocEntry").toString();
+                Long sapNo = Long.valueOf(map.get("DocEntry").toString())+1;
                 // todo 删除 垃圾数据
                 sapDao.reomverNullData();
+                // 修改sap 编号数据
+                sapDao.updateOnnmAutoKey(sapNo);
+                sapDao.updateNNM1NextNumber(sapNo);
                 return R.ok("装配完成");
             }
         }
diff --git a/src/main/resources/mapper/finishedProduct/SapDao.xml b/src/main/resources/mapper/finishedProduct/SapDao.xml
index 612b00d..93de481 100644
--- a/src/main/resources/mapper/finishedProduct/SapDao.xml
+++ b/src/main/resources/mapper/finishedProduct/SapDao.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gaotao.modules.finishedProduct.dao.SapDao">
+    <update id="updateOnnmAutoKey">
+        update YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
+    </update>
+    <update id="updateNNM1NextNumber">
+        update YRTEST.dbo.NNM1 set NextNumber = #{AutoKey} where ObjectCOde = 15
+    </update>
 
 
     <delete id="reomverNullData">
diff --git a/src/main/resources/static/pda/js/productwarehouse/packingout.js b/src/main/resources/static/pda/js/productwarehouse/packingout.js
index e044b89..2d3e1d0 100644
--- a/src/main/resources/static/pda/js/productwarehouse/packingout.js
+++ b/src/main/resources/static/pda/js/productwarehouse/packingout.js
@@ -270,7 +270,6 @@ function pickingPrint(val ) {
                 $("#rollNo").val('');
                 $("#rollNo").focus();
             }
-
             if (data.code == 500) {
                 layer.msg(data.msg)
             }