diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java b/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java index 1cbdc1f..45c30f7 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java @@ -21,6 +21,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; +import java.util.UUID; /** * @author 16358 @@ -268,6 +269,7 @@ public class ApiTask { // 3. 保存过磅申请 Poundappli poundappli = new Poundappli(); + poundappli.setId(UUID.randomUUID().toString()); poundappli.setBllstate("1");//过磅状态 poundappli.setBsndt(date); poundappli.setUsrcode(billNo); @@ -283,7 +285,7 @@ public class ApiTask { poundappli.setOabilltype(formid);//星空单据类型 poundappli.setSrcbilltype("发货通知单");//来源单据类型 - poundappliService.insertPoundappli(poundappli); + poundappliService.insertPoundappliDpi(poundappli); } } diff --git a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml index f8c3659..9d73380 100644 --- a/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml +++ b/measurement/src/main/resources/mapper/measurement/bill/PoundappliMapper.xml @@ -90,78 +90,87 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert IGNORE into t_data_poundappli - - id, - bllstate, - usrcode, - bsndt, - carno, - itmname, - specification, - sendunitid, - sendunitname, - recentname, - trnentname, - srcpunbll, - srcwghmqty, - srcempmqty, - srccleanmqty, - srcbsndt, - msrunit, - msrname, - itmno, - cardriver, - poundid, - poundname, - srcbillusrcode, - crtorgid, - isinuse, - crtdt, - crtopr, - lstedtdt, - lstedtopr, - fid, - fentity_fentryid, - oabilltype, - remark, - - - #{id}, - #{bllstate}, - #{usrcode}, - #{bsndt}, - #{carno}, - #{itmname}, - #{specification}, - #{sendunitid}, - #{sendunitname}, - #{recentname}, - #{trnentname}, - #{srcpunbll}, - #{srcwghmqty}, - #{srcempmqty}, - #{srccleanmqty}, - #{srcbsndt}, - #{msrunit}, - #{msrname}, - #{itmno}, - #{cardriver}, - #{poundid}, - #{poundname}, - #{srcbillusrcode}, - #{crtorgid}, - #{isinuse}, - #{crtdt}, - #{crtopr}, - #{lstedtdt}, - #{lstedtopr}, - #{fid}, - #{fentity_fentryid}, - #{oabilltype}, - #{remark}, - - + INSERT IGNORE INTO t_data_poundappli + + id, + bllstate, + usrcode, + bsndt, + carno, + itmname, + specification, + sendunitid, + sendunitname, + recentname, + trnentname, + srcpunbll, + srcwghmqty, + srcempmqty, + srccleanmqty, + srcbsndt, + msrunit, + msrname, + itmno, + cardriver, + poundid, + poundname, + srcbillusrcode, + crtorgid, + isinuse, + crtdt, + crtopr, + lstedtdt, + lstedtopr, + fid, + fentity_fentryid, + oabilltype, + remark, + + + SELECT + + #{id}, + #{bllstate}, + #{usrcode}, + #{bsndt}, + #{carno}, + #{itmname}, + #{specification}, + #{sendunitid}, + #{sendunitname}, + #{recentname}, + #{trnentname}, + #{srcpunbll}, + #{srcwghmqty}, + #{srcempmqty}, + #{srccleanmqty}, + #{srcbsndt}, + #{msrunit}, + #{msrname}, + #{itmno}, + #{cardriver}, + #{poundid}, + #{poundname}, + #{srcbillusrcode}, + #{crtorgid}, + #{isinuse}, + #{crtdt}, + #{crtopr}, + #{lstedtdt}, + #{lstedtopr}, + #{fid}, + #{fentity_fentryid}, + #{oabilltype}, + #{remark}, + + + FROM DUAL + WHERE NOT EXISTS ( + SELECT 1 FROM t_data_poundappli + WHERE fentity_fentryid = #{fentity_fentryid} + ) + +