diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.java
index ae3afd3a..6e2dd1b4 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.java
@@ -1,6 +1,7 @@
package com.hzya.frame.plugin.lets.entity;
import com.hzya.frame.web.entity.BaseEntity;
+import lombok.Data;
/**
* (IcGeneralH)实体类
@@ -8,6 +9,7 @@ import com.hzya.frame.web.entity.BaseEntity;
* @author makejava
* @since 2023-09-04 19:00:38
*/
+@Data
public class IcGeneralHEntity extends BaseEntity {
private String bassetcard;
@@ -119,818 +121,20 @@ public class IcGeneralHEntity extends BaseEntity {
*/
private String end_signatureTime;
+ /**
+ * 制单开始时间
+ */
+ private String tmaketime_start;
+
+ /**
+ * 制单结束时间
+ */
+ private String tmaketime_end;
+
/**
* 来源表头id
*/
private String csourcebillhid;
- public String getCsourcebillhid() {
- return csourcebillhid;
- }
-
- public void setCsourcebillhid(String csourcebillhid) {
- this.csourcebillhid = csourcebillhid;
- }
-
- public String getStart_signatureTime() {
- return start_signatureTime;
- }
-
- public void setStart_signatureTime(String start_signatureTime) {
- this.start_signatureTime = start_signatureTime;
- }
-
- public String getEnd_signatureTime() {
- return end_signatureTime;
- }
-
- public void setEnd_signatureTime(String end_signatureTime) {
- this.end_signatureTime = end_signatureTime;
- }
-
- public String getBassetcard() {
- return bassetcard;
- }
-
- public void setBassetcard(String bassetcard) {
- this.bassetcard = bassetcard;
- }
-
- public String getBdelivedtorm() {
- return bdelivedtorm;
- }
-
- public void setBdelivedtorm(String bdelivedtorm) {
- this.bdelivedtorm = bdelivedtorm;
- }
-
- public String getBdirecttranflag() {
- return bdirecttranflag;
- }
-
- public void setBdirecttranflag(String bdirecttranflag) {
- this.bdirecttranflag = bdirecttranflag;
- }
-
- public String getBoutretflag() {
- return boutretflag;
- }
-
- public void setBoutretflag(String boutretflag) {
- this.boutretflag = boutretflag;
- }
-
- public String getBsalecooppur() {
- return bsalecooppur;
- }
-
- public void setBsalecooppur(String bsalecooppur) {
- this.bsalecooppur = bsalecooppur;
- }
-
- public String getCauditorid() {
- return cauditorid;
- }
-
- public void setCauditorid(String cauditorid) {
- this.cauditorid = cauditorid;
- }
-
- public String getCbilltypecode() {
- return cbilltypecode;
- }
-
- public void setCbilltypecode(String cbilltypecode) {
- this.cbilltypecode = cbilltypecode;
- }
-
- public String getCbizid() {
- return cbizid;
- }
-
- public void setCbizid(String cbizid) {
- this.cbizid = cbizid;
- }
-
- public String getCbiztype() {
- return cbiztype;
- }
-
- public void setCbiztype(String cbiztype) {
- this.cbiztype = cbiztype;
- }
-
- public String getCcustomerid() {
- return ccustomerid;
- }
-
- public void setCcustomerid(String ccustomerid) {
- this.ccustomerid = ccustomerid;
- }
-
- public String getCdilivertypeid() {
- return cdilivertypeid;
- }
-
- public void setCdilivertypeid(String cdilivertypeid) {
- this.cdilivertypeid = cdilivertypeid;
- }
-
- public String getCdispatcherid() {
- return cdispatcherid;
- }
-
- public void setCdispatcherid(String cdispatcherid) {
- this.cdispatcherid = cdispatcherid;
- }
-
- public String getCdptid() {
- return cdptid;
- }
-
- public void setCdptid(String cdptid) {
- this.cdptid = cdptid;
- }
-
- public String getCendreportid() {
- return cendreportid;
- }
-
- public void setCendreportid(String cendreportid) {
- this.cendreportid = cendreportid;
- }
-
- public String getCgeneralhid() {
- return cgeneralhid;
- }
-
- public void setCgeneralhid(String cgeneralhid) {
- this.cgeneralhid = cgeneralhid;
- }
-
- public String getCinventoryid() {
- return cinventoryid;
- }
-
- public void setCinventoryid(String cinventoryid) {
- this.cinventoryid = cinventoryid;
- }
-
- public String getClastmodiid() {
- return clastmodiid;
- }
-
- public void setClastmodiid(String clastmodiid) {
- this.clastmodiid = clastmodiid;
- }
-
- public String getCoperatorid() {
- return coperatorid;
- }
-
- public void setCoperatorid(String coperatorid) {
- this.coperatorid = coperatorid;
- }
-
- public String getCothercalbodyid() {
- return cothercalbodyid;
- }
-
- public void setCothercalbodyid(String cothercalbodyid) {
- this.cothercalbodyid = cothercalbodyid;
- }
-
- public String getCothercorpid() {
- return cothercorpid;
- }
-
- public void setCothercorpid(String cothercorpid) {
- this.cothercorpid = cothercorpid;
- }
-
- public String getCotherwhid() {
- return cotherwhid;
- }
-
- public void setCotherwhid(String cotherwhid) {
- this.cotherwhid = cotherwhid;
- }
-
- public String getCoutcalbodyid() {
- return coutcalbodyid;
- }
-
- public void setCoutcalbodyid(String coutcalbodyid) {
- this.coutcalbodyid = coutcalbodyid;
- }
-
- public String getCoutcorpid() {
- return coutcorpid;
- }
-
- public void setCoutcorpid(String coutcorpid) {
- this.coutcorpid = coutcorpid;
- }
-
- public String getCproviderid() {
- return cproviderid;
- }
-
- public void setCproviderid(String cproviderid) {
- this.cproviderid = cproviderid;
- }
-
- public String getCregister() {
- return cregister;
- }
-
- public void setCregister(String cregister) {
- this.cregister = cregister;
- }
-
- public String getCsettlepathid() {
- return csettlepathid;
- }
-
- public void setCsettlepathid(String csettlepathid) {
- this.csettlepathid = csettlepathid;
- }
-
- public String getCtrancustid() {
- return ctrancustid;
- }
-
- public void setCtrancustid(String ctrancustid) {
- this.ctrancustid = ctrancustid;
- }
-
- public String getCwarehouseid() {
- return cwarehouseid;
- }
-
- public void setCwarehouseid(String cwarehouseid) {
- this.cwarehouseid = cwarehouseid;
- }
-
- public String getCwastewarehouseid() {
- return cwastewarehouseid;
- }
-
- public void setCwastewarehouseid(String cwastewarehouseid) {
- this.cwastewarehouseid = cwastewarehouseid;
- }
-
- public String getCwhsmanagerid() {
- return cwhsmanagerid;
- }
-
- public void setCwhsmanagerid(String cwhsmanagerid) {
- this.cwhsmanagerid = cwhsmanagerid;
- }
-
- public String getDaccountdate() {
- return daccountdate;
- }
-
- public void setDaccountdate(String daccountdate) {
- this.daccountdate = daccountdate;
- }
-
- public String getDauditdate() {
- return dauditdate;
- }
-
- public void setDauditdate(String dauditdate) {
- this.dauditdate = dauditdate;
- }
-
- public String getDbilldate() {
- return dbilldate;
- }
-
- public void setDbilldate(String dbilldate) {
- this.dbilldate = dbilldate;
- }
-
- public Integer getDr() {
- return dr;
- }
-
- public void setDr(Integer dr) {
- this.dr = dr;
- }
-
- public Integer getFallocflag() {
- return fallocflag;
- }
-
- public void setFallocflag(Integer fallocflag) {
- this.fallocflag = fallocflag;
- }
-
- public Integer getFbillflag() {
- return fbillflag;
- }
-
- public void setFbillflag(Integer fbillflag) {
- this.fbillflag = fbillflag;
- }
-
- public String getFreplenishflag() {
- return freplenishflag;
- }
-
- public void setFreplenishflag(String freplenishflag) {
- this.freplenishflag = freplenishflag;
- }
-
- public Integer getFspecialflag() {
- return fspecialflag;
- }
-
- public void setFspecialflag(Integer fspecialflag) {
- this.fspecialflag = fspecialflag;
- }
-
- public Integer getIprintcount() {
- return iprintcount;
- }
-
- public void setIprintcount(Integer iprintcount) {
- this.iprintcount = iprintcount;
- }
-
- public Double getNdiscountmny() {
- return ndiscountmny;
- }
-
- public void setNdiscountmny(Double ndiscountmny) {
- this.ndiscountmny = ndiscountmny;
- }
-
- public Double getNnetmny() {
- return nnetmny;
- }
-
- public void setNnetmny(Double nnetmny) {
- this.nnetmny = nnetmny;
- }
-
- public Double getNtotalmny() {
- return ntotalmny;
- }
-
- public void setNtotalmny(Double ntotalmny) {
- this.ntotalmny = ntotalmny;
- }
-
- public Double getNtotalnum() {
- return ntotalnum;
- }
-
- public void setNtotalnum(Double ntotalnum) {
- this.ntotalnum = ntotalnum;
- }
-
- public String getOutsourcewarehouseid() {
- return outsourcewarehouseid;
- }
-
- public void setOutsourcewarehouseid(String outsourcewarehouseid) {
- this.outsourcewarehouseid = outsourcewarehouseid;
- }
-
- public String getPkCalbody() {
- return pkCalbody;
- }
-
- public void setPkCalbody(String pkCalbody) {
- this.pkCalbody = pkCalbody;
- }
-
- public String getPkCorp() {
- return pkCorp;
- }
-
- public void setPkCorp(String pkCorp) {
- this.pkCorp = pkCorp;
- }
-
- public String getPkCubasdoc() {
- return pkCubasdoc;
- }
-
- public void setPkCubasdoc(String pkCubasdoc) {
- this.pkCubasdoc = pkCubasdoc;
- }
-
- public String getPkCubasdocc() {
- return pkCubasdocc;
- }
-
- public void setPkCubasdocc(String pkCubasdocc) {
- this.pkCubasdocc = pkCubasdocc;
- }
-
- public String getPkDefdoc1() {
- return pkDefdoc1;
- }
-
- public void setPkDefdoc1(String pkDefdoc1) {
- this.pkDefdoc1 = pkDefdoc1;
- }
-
- public String getPkDefdoc10() {
- return pkDefdoc10;
- }
-
- public void setPkDefdoc10(String pkDefdoc10) {
- this.pkDefdoc10 = pkDefdoc10;
- }
-
- public String getPkDefdoc11() {
- return pkDefdoc11;
- }
-
- public void setPkDefdoc11(String pkDefdoc11) {
- this.pkDefdoc11 = pkDefdoc11;
- }
-
- public String getPkDefdoc12() {
- return pkDefdoc12;
- }
-
- public void setPkDefdoc12(String pkDefdoc12) {
- this.pkDefdoc12 = pkDefdoc12;
- }
-
- public String getPkDefdoc13() {
- return pkDefdoc13;
- }
-
- public void setPkDefdoc13(String pkDefdoc13) {
- this.pkDefdoc13 = pkDefdoc13;
- }
-
- public String getPkDefdoc14() {
- return pkDefdoc14;
- }
-
- public void setPkDefdoc14(String pkDefdoc14) {
- this.pkDefdoc14 = pkDefdoc14;
- }
-
- public String getPkDefdoc15() {
- return pkDefdoc15;
- }
-
- public void setPkDefdoc15(String pkDefdoc15) {
- this.pkDefdoc15 = pkDefdoc15;
- }
-
- public String getPkDefdoc16() {
- return pkDefdoc16;
- }
-
- public void setPkDefdoc16(String pkDefdoc16) {
- this.pkDefdoc16 = pkDefdoc16;
- }
-
- public String getPkDefdoc17() {
- return pkDefdoc17;
- }
-
- public void setPkDefdoc17(String pkDefdoc17) {
- this.pkDefdoc17 = pkDefdoc17;
- }
-
- public String getPkDefdoc18() {
- return pkDefdoc18;
- }
-
- public void setPkDefdoc18(String pkDefdoc18) {
- this.pkDefdoc18 = pkDefdoc18;
- }
-
- public String getPkDefdoc19() {
- return pkDefdoc19;
- }
-
- public void setPkDefdoc19(String pkDefdoc19) {
- this.pkDefdoc19 = pkDefdoc19;
- }
-
- public String getPkDefdoc2() {
- return pkDefdoc2;
- }
-
- public void setPkDefdoc2(String pkDefdoc2) {
- this.pkDefdoc2 = pkDefdoc2;
- }
-
- public String getPkDefdoc20() {
- return pkDefdoc20;
- }
-
- public void setPkDefdoc20(String pkDefdoc20) {
- this.pkDefdoc20 = pkDefdoc20;
- }
-
- public String getPkDefdoc3() {
- return pkDefdoc3;
- }
-
- public void setPkDefdoc3(String pkDefdoc3) {
- this.pkDefdoc3 = pkDefdoc3;
- }
-
- public String getPkDefdoc4() {
- return pkDefdoc4;
- }
-
- public void setPkDefdoc4(String pkDefdoc4) {
- this.pkDefdoc4 = pkDefdoc4;
- }
-
- public String getPkDefdoc5() {
- return pkDefdoc5;
- }
-
- public void setPkDefdoc5(String pkDefdoc5) {
- this.pkDefdoc5 = pkDefdoc5;
- }
-
- public String getPkDefdoc6() {
- return pkDefdoc6;
- }
-
- public void setPkDefdoc6(String pkDefdoc6) {
- this.pkDefdoc6 = pkDefdoc6;
- }
-
- public String getPkDefdoc7() {
- return pkDefdoc7;
- }
-
- public void setPkDefdoc7(String pkDefdoc7) {
- this.pkDefdoc7 = pkDefdoc7;
- }
-
- public String getPkDefdoc8() {
- return pkDefdoc8;
- }
-
- public void setPkDefdoc8(String pkDefdoc8) {
- this.pkDefdoc8 = pkDefdoc8;
- }
-
- public String getPkDefdoc9() {
- return pkDefdoc9;
- }
-
- public void setPkDefdoc9(String pkDefdoc9) {
- this.pkDefdoc9 = pkDefdoc9;
- }
-
- public String getPkMeasware() {
- return pkMeasware;
- }
-
- public void setPkMeasware(String pkMeasware) {
- this.pkMeasware = pkMeasware;
- }
-
- public String getPkPurcorp() {
- return pkPurcorp;
- }
-
- public void setPkPurcorp(String pkPurcorp) {
- this.pkPurcorp = pkPurcorp;
- }
-
- public String getTaccounttime() {
- return taccounttime;
- }
-
- public void setTaccounttime(String taccounttime) {
- this.taccounttime = taccounttime;
- }
-
- public String getTlastmoditime() {
- return tlastmoditime;
- }
-
- public void setTlastmoditime(String tlastmoditime) {
- this.tlastmoditime = tlastmoditime;
- }
-
- public String getTmaketime() {
- return tmaketime;
- }
-
- public void setTmaketime(String tmaketime) {
- this.tmaketime = tmaketime;
- }
-
- public String getTs() {
- return ts;
- }
-
- public void setTs(String ts) {
- this.ts = ts;
- }
-
- public String getVbillcode() {
- return vbillcode;
- }
-
- public void setVbillcode(String vbillcode) {
- this.vbillcode = vbillcode;
- }
-
- public String getVdiliveraddress() {
- return vdiliveraddress;
- }
-
- public void setVdiliveraddress(String vdiliveraddress) {
- this.vdiliveraddress = vdiliveraddress;
- }
-
- public String getVheadnote2() {
- return vheadnote2;
- }
-
- public void setVheadnote2(String vheadnote2) {
- this.vheadnote2 = vheadnote2;
- }
-
- public String getVnote() {
- return vnote;
- }
-
- public void setVnote(String vnote) {
- this.vnote = vnote;
- }
-
- public String getVuserdef1() {
- return vuserdef1;
- }
-
- public void setVuserdef1(String vuserdef1) {
- this.vuserdef1 = vuserdef1;
- }
-
- public String getVuserdef10() {
- return vuserdef10;
- }
-
- public void setVuserdef10(String vuserdef10) {
- this.vuserdef10 = vuserdef10;
- }
-
- public String getVuserdef11() {
- return vuserdef11;
- }
-
- public void setVuserdef11(String vuserdef11) {
- this.vuserdef11 = vuserdef11;
- }
-
- public String getVuserdef12() {
- return vuserdef12;
- }
-
- public void setVuserdef12(String vuserdef12) {
- this.vuserdef12 = vuserdef12;
- }
-
- public String getVuserdef13() {
- return vuserdef13;
- }
-
- public void setVuserdef13(String vuserdef13) {
- this.vuserdef13 = vuserdef13;
- }
-
- public String getVuserdef14() {
- return vuserdef14;
- }
-
- public void setVuserdef14(String vuserdef14) {
- this.vuserdef14 = vuserdef14;
- }
-
- public String getVuserdef15() {
- return vuserdef15;
- }
-
- public void setVuserdef15(String vuserdef15) {
- this.vuserdef15 = vuserdef15;
- }
-
- public String getVuserdef16() {
- return vuserdef16;
- }
-
- public void setVuserdef16(String vuserdef16) {
- this.vuserdef16 = vuserdef16;
- }
-
- public String getVuserdef17() {
- return vuserdef17;
- }
-
- public void setVuserdef17(String vuserdef17) {
- this.vuserdef17 = vuserdef17;
- }
-
- public String getVuserdef18() {
- return vuserdef18;
- }
-
- public void setVuserdef18(String vuserdef18) {
- this.vuserdef18 = vuserdef18;
- }
-
- public String getVuserdef19() {
- return vuserdef19;
- }
-
- public void setVuserdef19(String vuserdef19) {
- this.vuserdef19 = vuserdef19;
- }
-
- public String getVuserdef2() {
- return vuserdef2;
- }
-
- public void setVuserdef2(String vuserdef2) {
- this.vuserdef2 = vuserdef2;
- }
-
- public String getVuserdef20() {
- return vuserdef20;
- }
-
- public void setVuserdef20(String vuserdef20) {
- this.vuserdef20 = vuserdef20;
- }
-
- public String getVuserdef3() {
- return vuserdef3;
- }
-
- public void setVuserdef3(String vuserdef3) {
- this.vuserdef3 = vuserdef3;
- }
-
- public String getVuserdef4() {
- return vuserdef4;
- }
-
- public void setVuserdef4(String vuserdef4) {
- this.vuserdef4 = vuserdef4;
- }
-
- public String getVuserdef5() {
- return vuserdef5;
- }
-
- public void setVuserdef5(String vuserdef5) {
- this.vuserdef5 = vuserdef5;
- }
-
- public String getVuserdef6() {
- return vuserdef6;
- }
-
- public void setVuserdef6(String vuserdef6) {
- this.vuserdef6 = vuserdef6;
- }
-
- public String getVuserdef7() {
- return vuserdef7;
- }
-
- public void setVuserdef7(String vuserdef7) {
- this.vuserdef7 = vuserdef7;
- }
-
- public String getVuserdef8() {
- return vuserdef8;
- }
-
- public void setVuserdef8(String vuserdef8) {
- this.vuserdef8 = vuserdef8;
- }
-
- public String getVuserdef9() {
- return vuserdef9;
- }
-
- public void setVuserdef9(String vuserdef9) {
- this.vuserdef9 = vuserdef9;
- }
-
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.xml
index bdbeb6af..8bda915e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/IcGeneralHEntity.xml
@@ -343,7 +343,12 @@
and cgeneralhid IN ( SELECT cgeneralhid FROM ic_general_b WHERE dr = 0 AND csourcebillhid = #{csourcebillhid} )
- and dr=0
+
+ and tmaketime >= #{tmaketime_start}
+ and tmaketime <= #{tmaketime_end}
+
+
+ and dr=0
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java
index e0ef4414..3ae80351 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java
@@ -1,13 +1,25 @@
package com.hzya.frame.plugin.lets.plugin.adjust;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.lets.constant.OverallConstant;
import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant;
import com.hzya.frame.plugin.lets.dao.IIcGeneralHDao;
+import com.hzya.frame.plugin.lets.entity.BdCorpEntity;
+import com.hzya.frame.plugin.lets.entity.IcGeneralHEntity;
+import com.hzya.frame.plugin.lets.u8cdto.IcGeneralAuditVO;
+import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto;
import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil;
+import com.hzya.frame.plugin.lets.util.QueryU8CEntityUtil;
import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil;
+import com.hzya.frame.plugin.lets.util.pushData.Attribute;
import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode;
+import com.hzya.frame.plugin.lets.util.pushData.ZTResult;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
import com.hzya.frame.ttxofs.service.OfsUnifiedService;
@@ -16,6 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
/**
@@ -64,6 +79,8 @@ public class OtherInPluginInitializer extends PluginBaseEntity {
private OfsUnifiedService ofsUnifiedService;
@Autowired
private IIcGeneralHDao iIcGeneralHDao;
+ @Autowired
+ private QueryU8CEntityUtil queryU8CEntityUtil;
@Override
public String getPluginType() {
return "1";
@@ -105,12 +122,197 @@ public class OtherInPluginInitializer extends PluginBaseEntity {
}
public void start(){
+ //获取当前时间
+ Date currentDate = new Date();
+ Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10);
+ Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -4);
+ String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss");
+ String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss");
+
+ IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
+ icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4A");//其他入库单
+ icGeneralHEntity.setTmaketime_start(startTimeStr);
+ icGeneralHEntity.setTmaketime_start(endTimeStr);
+ icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
+ if(icGeneralHList.size()==0){
+ return;
+ }
+ //过滤成功日志
+ List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ return;
+ }
+
+ //推送
+ implement(filterIcGeneralHList);
+
+
+
}
public void start(String vbillcode){
+ try {
+ IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
+ icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4A");//其他入库单
+ icGeneralHEntity.setVbillcode(vbillcode);
+ icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
+ if(icGeneralHList.size()==0){
+ Assert.state(false, "丽知：其他入库单:{},查询到该单据", vbillcode);
+ }
+ //过滤成功日志
+ List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ Assert.state(false, "丽知：其他入库单:{},自动审核已被推送成功，请勿重新推送", vbillcode);
+ }
+
+ //推送
+ implement(filterIcGeneralHList);
+ }catch (Exception e){
+ logger.error("丽知：其他入库单自动审核,start()方法报错："+e);
+ }
}
public void start(String startTime, String endTime){
+ Date business_start = DateUtil.parse(startTime);
+ Date business_end = DateUtil.parse(endTime);
+ String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00";
+ String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59";
+
+ IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
+ icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4A");//其他入库单
+ icGeneralHEntity.setTmaketime_start(start);
+ icGeneralHEntity.setTmaketime_start(end);
+ icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
+ if(icGeneralHList.size()==0){
+ Assert.state(false, "丽知：其他入库单，根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到其他入库单", startTime, endTime);
+ }
+ //过滤成功日志
+ List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ Assert.state(false, "丽知：其他入库单，根据日期期间[开始时间]-[结束时间]：{}-{}，该期间其他入库单已被推送成功，请勿重新推送", startTime, endTime);
+ }
+
+ //推送
+ implement(filterIcGeneralHList);
}
+
+ /**
+ * 根据单据号过滤
+ * vbillcode+pk_corp
+ * @param icGeneralHList
+ * @return
+ */
+ public List filterData(List icGeneralHList){
+ List filterIcGeneralHList=new ArrayList<>();
+ for (IcGeneralHEntity icGeneralHEntity : icGeneralHList) {
+ String rootAppPk =icGeneralHEntity.getVbillcode()+"_"+icGeneralHEntity.getPkCorp();
+ boolean isExis = true;
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+ integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk);
+ integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+ integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+ List integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity);
+ if (integrationTaskLivingDetailsEntities == null || integrationTaskLivingDetailsEntities.size() == 0) {
+ isExis = false;
+ }if (!isExis) {
+ filterIcGeneralHList.add(icGeneralHEntity);
+ }
+ }
+ if (filterIcGeneralHList.size() == 0) {
+ return null;
+ }
+ return filterIcGeneralHList;
+ }
+
+ public void implement(List filterIcGeneralHList){
+ for (IcGeneralHEntity icGeneralHEntity : filterIcGeneralHList) {
+
+ String mapStr = "";
+ String format = icGeneralHEntity.getDbilldate();
+ String response = "";
+ String ofsCode = "";
+
+ try {
+ System.out.println(icGeneralHEntity);
+
+ IcGeneralAuditVO icGeneralAuditVO = new IcGeneralAuditVO();
+ IcGeneralAuditVO.QueryInfo queryInfo = new IcGeneralAuditVO.QueryInfo();
+
+ //单据号
+ queryInfo.setBillcode(icGeneralHEntity.getVbillcode());
+ //公司
+ BdCorpEntity bdCorpEntity = queryU8CEntityUtil.queryBdCorpByPkCorp(icGeneralHEntity.getPkCorp());
+ if (bdCorpEntity == null) {
+ Assert.state(false,"查询公司主键：{}，失败。请检查公司主键",icGeneralHEntity.getPkCorp());
+ }
+ queryInfo.setCorp(bdCorpEntity.getUnitcode());
+
+ //审核人
+ IcGeneralAuditVO.SignInfo signInfo = new IcGeneralAuditVO.SignInfo();
+ signInfo.setCoperator(OverallConstant.getOverAllValue("u8cApiZdrCode"));
+
+ icGeneralAuditVO.setQueryInfo(queryInfo);
+ icGeneralAuditVO.setSignInfo(signInfo);
+
+// mapStr="{"+ JSONUtil.toJsonStr(icGeneralAuditVO)+"}";
+ mapStr= JSONUtil.toJsonStr(icGeneralAuditVO);
+ System.out.println(mapStr);
+
+ //推送
+ ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("otherinsignCode"), mapStr);
+ //两层判断,一层中台转发,一层u8c返回
+ if ("false".equals(ztResult.getFlag())) {
+ //转发失败
+ response = JSONUtil.toJsonStr(ztResult.getAttribute());
+ Assert.state(false, "丽知：其他出库单自动审核，中台转发失败,失败原因:{}", ztResult.getAttribute());
+ }
+ Attribute attribute = ztResult.getAttribute();
+ System.out.println(attribute);
+ boolean isSuccess = false;
+ if ("success".equals(attribute.getStatus())) {
+ isSuccess = true;
+ }
+ if (!isSuccess) {
+ Assert.state(false, "推送U8C--> 丽知：其他出库单自动审核 失败 接口返回结果：{} 接口入参:{}", response, mapStr);
+ }
+
+ //成功
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+ integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y);
+ integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
+ integrationTaskLivingDetailsEntity.setNewTransmitInfo(response);
+ integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+ integrationTaskLivingDetailsEntity.setBusinessDate(format);
+ integrationTaskLivingDetailsEntity.setRootAppPk(icGeneralHEntity.getVbillcode()+"_"+icGeneralHEntity.getPkCorp());
+ integrationTaskLivingDetailsEntity.setRootAppBill(icGeneralHEntity.getVbillcode());
+ integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+ saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);
+
+ }catch (Exception e){
+ e.printStackTrace();
+ logger.error("推送U8C--> 丽知：其他出库单自动审核失败，失败原因：" + e);
+
+ //失败
+ ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class);
+ String ErrMessage = "推送U8C--> 丽知：其他出库单自动审核失败，失败原因：" + reusltStrDto.getErrormsg();
+ IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
+ integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
+ integrationTaskLivingDetailsEntity.setRootAppNewData(mapStr);
+ integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage);
+ integrationTaskLivingDetailsEntity.setNewPushDate(new Date());
+ integrationTaskLivingDetailsEntity.setBusinessDate(format);
+ integrationTaskLivingDetailsEntity.setRootAppPk(icGeneralHEntity.getVbillcode()+"_"+icGeneralHEntity.getPkCorp());
+ integrationTaskLivingDetailsEntity.setRootAppBill(icGeneralHEntity.getVbillcode());
+ integrationTaskLivingDetailsEntity.setPluginId(getPluginId());
+ saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);
+ }
+ }
+ }
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java
index 1914bbbf..12b0cbcd 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java
@@ -133,12 +133,34 @@ public class OtherOutPluginInitializer extends PluginBaseEntity {
String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss");
String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss");
+ IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
+ icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4I");//其他出库单
+ icGeneralHEntity.setTmaketime_start(startTimeStr);
+ icGeneralHEntity.setTmaketime_start(endTimeStr);
+ icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
+ if(icGeneralHList.size()==0){
+ return;
+ }
+ //过滤成功日志
+ List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ return;
+ }
+
+ //推送
+ implement(filterIcGeneralHList);
+
+
+
}
public void start(String vbillcode){
try {
IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4I");//其他出库单
icGeneralHEntity.setVbillcode(vbillcode);
icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
@@ -147,6 +169,9 @@ public class OtherOutPluginInitializer extends PluginBaseEntity {
}
//过滤成功日志
List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ Assert.state(false, "丽知：其他出库单:{},自动审核已被推送成功，请勿重新推送", vbillcode);
+ }
//推送
implement(filterIcGeneralHList);
@@ -161,6 +186,25 @@ public class OtherOutPluginInitializer extends PluginBaseEntity {
String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00";
String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59";
+ IcGeneralHEntity icGeneralHEntity = new IcGeneralHEntity();
+ icGeneralHEntity.setVuserdef15("ZZ");
+ icGeneralHEntity.setCbilltypecode("4I");//其他出库单
+ icGeneralHEntity.setTmaketime_start(start);
+ icGeneralHEntity.setTmaketime_start(end);
+ icGeneralHEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List icGeneralHList = iIcGeneralHDao.query(icGeneralHEntity);
+ if(icGeneralHList.size()==0){
+ Assert.state(false, "丽知：其他出库单，根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到其他出库单", startTime, endTime);
+ }
+ //过滤成功日志
+ List filterIcGeneralHList=filterData(icGeneralHList);
+ if (filterIcGeneralHList.size() == 0) {
+ Assert.state(false, "丽知：其他出库单，根据日期期间[开始时间]-[结束时间]：{}-{}，该期间其他出库单已被推送成功，请勿重新推送", startTime, endTime);
+ }
+
+ //推送
+ implement(filterIcGeneralHList);
+
}
/**
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java
index 1c84a8fe..c8ba699b 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java
@@ -1,10 +1,7 @@
package com.hzya.frame.plugin.lets.plugin.transfer;
import com.hzya.frame.WebappApplication;
-import com.hzya.frame.plugin.lets.plugin.adjust.AdjustInPluginInitializer;
-import com.hzya.frame.plugin.lets.plugin.adjust.AdjustInZZPluginInitializer;
-import com.hzya.frame.plugin.lets.plugin.adjust.AdjustOutPluginInitializer;
-import com.hzya.frame.plugin.lets.plugin.adjust.OtherOutPluginInitializer;
+import com.hzya.frame.plugin.lets.plugin.adjust.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +26,8 @@ public class TransferTest {
private AdjustInZZPluginInitializer adjustInZZPluginInitializerm;
@Autowired
private OtherOutPluginInitializer otherOutPluginInitializer;
+ @Autowired
+ private OtherInPluginInitializer otherInPluginInitializer;
////////////////////////////////////////////////////////////////////////////////////调拨订单
// @Test
@@ -116,7 +115,13 @@ public class TransferTest {
////////////////////////////////////////////////////////////////////////////////////出库审核
@Test
public void t60(){
- otherOutPluginInitializer.start("TC2409130004");
+ otherOutPluginInitializer.start("TC2409130006");
}
////////////////////////////////////////////////////////////////////////////////////出库审核
+ ////////////////////////////////////////////////////////////////////////////////////入库审核
+ @Test
+ public void t70(){
+ otherInPluginInitializer.start("TR2409130007");
+ }
+ ////////////////////////////////////////////////////////////////////////////////////入库审核
}