丽知:调拨出入库修改。

This commit is contained in:
zhengyf 2024-08-21 18:12:57 +08:00
parent 6a08847659
commit 00c664d20d
9 changed files with 303 additions and 1737 deletions

View File

@ -16,6 +16,7 @@ public interface IIcGeneralBDao extends IBaseDao<IcGeneralBEntity, String> {
* 根据cgeneralhid表头主键查询
*/
public List<IcGeneralBEntity> queryByCgeneralhid(String cgeneralhid);
public List<IcGeneralBEntity> queryAndCinvbasCode(String cgeneralhid);
}

View File

@ -1,6 +1,8 @@
package com.hzya.frame.plugin.lets.dao.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant;
import com.hzya.frame.plugin.lets.dao.IIcGeneralBDao;
import com.hzya.frame.plugin.lets.entity.IcGeneralBEntity;
@ -18,5 +20,10 @@ public class IcGeneralBDaoImpl extends MybatisGenericDao<IcGeneralBEntity, Strin
public List<IcGeneralBEntity> queryByCgeneralhid(String cgeneralhid) {
return query("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryByCgeneralhid",cgeneralhid);
}
@Override
@DS(ProfilesActiveConstant.LETS_DATE_SOURCE)
public List<IcGeneralBEntity> queryAndCinvbasCode(String cgeneralhid) {
return (List<IcGeneralBEntity>)selectList("com.hzya.frame.plugin.lets.entity.IcGeneralBEntity.queryAndCinvbasCode",cgeneralhid);
}
}

View File

@ -1,6 +1,6 @@
<?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.hzya.frame.plugin.lets.dao.impl.IcGeneralBDaoImpl">
<mapper namespace="com.hzya.frame.plugin.lets.entity.IcGeneralBEntity">
<resultMap id="get-IcGeneralBEntity-result" type="com.hzya.frame.plugin.lets.entity.IcGeneralBEntity" >
<result property="alrconfincomny" column="alrconfincomny" jdbcType="NUMERIC"/>
@ -35,6 +35,7 @@
<result property="cfreezeid" column="cfreezeid" jdbcType="VARCHAR"/>
<result property="cgeneralbid" column="cgeneralbid" jdbcType="VARCHAR"/>
<result property="cgeneralhid" column="cgeneralhid" jdbcType="VARCHAR"/>
<result property="cinvbascode" column="cinvbascode" jdbcType="VARCHAR"/>
<result property="cinvbasid" column="cinvbasid" jdbcType="VARCHAR"/>
<result property="cinventoryid" column="cinventoryid" jdbcType="VARCHAR"/>
<result property="corderBb1id" column="corder_bb1id" jdbcType="VARCHAR"/>
@ -253,8 +254,9 @@
,cfreezeid
,cgeneralbid
,cgeneralhid
,cinvbasid
,cinventoryid
,cinvbascode
,cinvbasid
,cinventoryid
,corder_bb1id
,cparentid
,cprojectid
@ -658,10 +660,240 @@
<if test="vuserdef9 != null and vuserdef9 != ''"> and vuserdef9 = #{vuserdef9} </if>
<if test="vvehiclecode != null and vvehiclecode != ''"> and vvehiclecode = #{vvehiclecode} </if>
<if test="writeofftype != null and writeofftype != ''"> and writeofftype = #{writeofftype} </if>
and dr=0
</trim>
<!-- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<select id="queryAndCinvbasCode" resultType="com.hzya.frame.plugin.lets.entity.IcGeneralBEntity" parameterType = "String">
select
ic_general_b.alrconfincomny
,ic_general_b.alrconfinconum
,ic_general_b.bbarcodeclose
,ic_general_b.bomversion
,ic_general_b.bonroadflag
,ic_general_b.breturnprofit
,ic_general_b.bsafeprice
,ic_general_b.bsourcelargess
,ic_general_b.bsupplyflag
,ic_general_b.btoinzgflag
,ic_general_b.btoouttoiaflag
,ic_general_b.btooutzgflag
,ic_general_b.btou8rm
,ic_general_b.btransasset
,ic_general_b.bzgflag
,ic_general_b.bzgyfflag
,ic_general_b.castunitid
,ic_general_b.cbodybilltypecode
,ic_general_b.cbodywarehouseid
,ic_general_b.ccheckstateid
,ic_general_b.ccorrespondbid
,ic_general_b.ccorrespondcode
,ic_general_b.ccorrespondhid
,ic_general_b.ccorrespondtype
,ic_general_b.ccostobject
,ic_general_b.ccurrencytypeid
,ic_general_b.cfirstbillbid
,ic_general_b.cfirstbillhid
,ic_general_b.cfirsttype
,ic_general_b.cfreezeid
,ic_general_b.cgeneralbid
,ic_general_b.cgeneralhid
,BD_INVBASDOC.invcode AS cinvbascode
,ic_general_b.cinvbasid
,ic_general_b.cinventoryid
,ic_general_b.corder_bb1id
,ic_general_b.cparentid
,ic_general_b.cprojectid
,ic_general_b.cprojectphaseid
,ic_general_b.cquotecurrency
,ic_general_b.cquoteunitid
,ic_general_b.creceieveid
,ic_general_b.creceiveareaid
,ic_general_b.creceivepointid
,ic_general_b.crowno
,ic_general_b.cselastunitid
,ic_general_b.csignwastbid
,ic_general_b.csignwasthid
,ic_general_b.csignwasttype
,ic_general_b.csourcebillbid
,ic_general_b.csourcebillhid
,ic_general_b.csourcetype
,ic_general_b.csourcewastbid
,ic_general_b.csourcewasthid
,ic_general_b.csourcewasttype
,ic_general_b.csrc2billbid
,ic_general_b.csrc2billhid
,ic_general_b.csrc2billtype
,ic_general_b.csumid
,ic_general_b.cvendorid
,ic_general_b.cworkcenterid
,ic_general_b.cworksiteid
,ic_general_b.cwp
,ic_general_b.dbizdate
,ic_general_b.ddeliverdate
,ic_general_b.dfirstbilldate
,ic_general_b.dr
,ic_general_b.drequiredate
,ic_general_b.drequiretime
,ic_general_b.dstandbydate
,ic_general_b.dvalidate
,ic_general_b.dzgdate
,ic_general_b.fassertcardflag
,ic_general_b.fbillrowflag
,ic_general_b.fchecked
,ic_general_b.flargess
,ic_general_b.ftoouttransflag
,ic_general_b.hsl
,ic_general_b.idesatype
,ic_general_b.inccontimepoint
,ic_general_b.inccontimepointname
,ic_general_b.isok
,ic_general_b.materialcost
,ic_general_b.naccumtonum
,ic_general_b.naccumwastnum
,ic_general_b.nbarcodenum
,ic_general_b.ncorrespondastnum
,ic_general_b.ncorrespondgrsnum
,ic_general_b.ncorrespondnum
,ic_general_b.ncountnum
,ic_general_b.nfeesettletimes
,ic_general_b.ninassistnum
,ic_general_b.ningrossnum
,ic_general_b.ninnum
,ic_general_b.nkdnum
,ic_general_b.nmny
,ic_general_b.nneedinassistnum
,ic_general_b.noutassistnum
,ic_general_b.noutgrossnum
,ic_general_b.noutnum
,ic_general_b.nplannedmny
,ic_general_b.nplannedprice
,ic_general_b.nprice
,ic_general_b.npricesettlebill
,ic_general_b.nquotemny
,ic_general_b.nquotentmny
,ic_general_b.nquotentprice
,ic_general_b.nquoteprice
,ic_general_b.nquoteunitnum
,ic_general_b.nquoteunitrate
,ic_general_b.nreplenishedastnum
,ic_general_b.nreplenishednum
,ic_general_b.nretastnum
,ic_general_b.nretgrossnum
,ic_general_b.nretnum
,ic_general_b.nsalemny
,ic_general_b.nsaleprice
,ic_general_b.nshouldinnum
,ic_general_b.nshouldoutassistnum
,ic_general_b.nshouldoutnum
,ic_general_b.ntarenum
,ic_general_b.ntaxmny
,ic_general_b.ntaxprice
,ic_general_b.ntotalmatchnum
,ic_general_b.ntotalreasonwastenum
,ic_general_b.ntranoutastnum
,ic_general_b.ntranoutnum
,ic_general_b.pk_bodycalbody
,ic_general_b.pk_corp
,ic_general_b.pk_creqwareid
,ic_general_b.pk_cubasdoc
,ic_general_b.pk_defdoc1
,ic_general_b.pk_defdoc10
,ic_general_b.pk_defdoc11
,ic_general_b.pk_defdoc12
,ic_general_b.pk_defdoc13
,ic_general_b.pk_defdoc14
,ic_general_b.pk_defdoc15
,ic_general_b.pk_defdoc16
,ic_general_b.pk_defdoc17
,ic_general_b.pk_defdoc18
,ic_general_b.pk_defdoc19
,ic_general_b.pk_defdoc2
,ic_general_b.pk_defdoc20
,ic_general_b.pk_defdoc3
,ic_general_b.pk_defdoc4
,ic_general_b.pk_defdoc5
,ic_general_b.pk_defdoc6
,ic_general_b.pk_defdoc7
,ic_general_b.pk_defdoc8
,ic_general_b.pk_defdoc9
,ic_general_b.pk_invoicecorp
,ic_general_b.pk_measware
,ic_general_b.pk_packsort
,ic_general_b.pk_reqcorp
,ic_general_b.pk_reqstoorg
,ic_general_b.pk_returnreason
,ic_general_b.process1
,ic_general_b.process2
,ic_general_b.process3
,ic_general_b.process4
,ic_general_b.process5
,ic_general_b.processcost
,ic_general_b.processmanid
,ic_general_b.serialnum
,ic_general_b.ts
,ic_general_b.vbatchcode
,ic_general_b.vbilltypeu8rm
,ic_general_b.vbodynote2
,ic_general_b.vcorrespondrowno
,ic_general_b.vfirstbillcode
,ic_general_b.vfirstrowno
,ic_general_b.vfree1
,ic_general_b.vfree10
,ic_general_b.vfree2
,ic_general_b.vfree3
,ic_general_b.vfree4
,ic_general_b.vfree5
,ic_general_b.vfree6
,ic_general_b.vfree7
,ic_general_b.vfree8
,ic_general_b.vfree9
,ic_general_b.vnotebody
,ic_general_b.vproductbatch
,ic_general_b.vreceiveaddress
,ic_general_b.vsignwastcode
,ic_general_b.vsignwastrowno
,ic_general_b.vsourcebillcode
,ic_general_b.vsourcerowno
,ic_general_b.vsourcewastcode
,ic_general_b.vsourcewastrowno
,ic_general_b.vsrc2billcode
,ic_general_b.vsrc2billrowno
,ic_general_b.vtransfercode
,ic_general_b.vuserdef1
,ic_general_b.vuserdef10
,ic_general_b.vuserdef11
,ic_general_b.vuserdef12
,ic_general_b.vuserdef13
,ic_general_b.vuserdef14
,ic_general_b.vuserdef15
,ic_general_b.vuserdef16
,ic_general_b.vuserdef17
,ic_general_b.vuserdef18
,ic_general_b.vuserdef19
,ic_general_b.vuserdef2
,ic_general_b.vuserdef20
,ic_general_b.vuserdef3
,ic_general_b.vuserdef4
,ic_general_b.vuserdef5
,ic_general_b.vuserdef6
,ic_general_b.vuserdef7
,ic_general_b.vuserdef8
,ic_general_b.vuserdef9
,ic_general_b.vvehiclecode
,ic_general_b.writeofftype
from ic_general_b ic_general_b
LEFT JOIN BD_INVBASDOC BD_INVBASDOC ON IC_GENERAL_B.cinvbasid=BD_INVBASDOC.PK_INVBASDOC
where ic_general_b.dr=0 and ic_general_b.cgeneralhid=#{cgeneralhid}
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.lets.entity.IcGeneralBEntity">

View File

@ -340,10 +340,8 @@
<if test="vuserdef7 != null and vuserdef7 != ''">and vuserdef7 = #{vuserdef7}</if>
<if test="vuserdef8 != null and vuserdef8 != ''">and vuserdef8 = #{vuserdef8}</if>
<if test="vuserdef9 != null and vuserdef9 != ''">and vuserdef9 = #{vuserdef9}</if>
and sts='Y'
and dr=0
</trim>
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!-- 查询符合条件的数量 -->

View File

@ -263,17 +263,49 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
//U8C调拨订单信息
// List<ToBillEntity> toBillEntityList = queryToBillByPkVdefdoc19(ofsSourceOrderCode);
//U8C调拨出库单主表信息
List<IcGeneralHEntity> icGeneralHEntityList = queryIcGeneralHByPkVdefdoc19(ofsSourceOrderCode);
if (icGeneralHEntityList == null) {
Assert.state(false,"在U8C内根据OFS调拨订单号pk_vdefdoc19:{},没有查询到调拨出库单,请检查。",ofsSourceOrderCode);
}
if(icGeneralHEntityList.size()>1){
Assert.state(false,"在U8C内根据OFS调拨订单号pk_vdefdoc19:{},查询到调拨出库单不唯一,请检查。",ofsSourceOrderCode);
}
IcGeneralHEntity icGeneralHEntity = icGeneralHEntityList.get(0);
//U8C调拨出库单子表信息
List<IcGeneralBEntity> icGeneralBEntityList = queryIcGeneralBByCgeneralhid(icGeneralHEntity.getCgeneralhid());
if(icGeneralBEntityList==null){
Assert.state(false,"在U8C内根据U8C调拨出库单主表主键{},调拨出库单单号:{},未查询到调拨出库单子表信息,请检查。",icGeneralHEntity.getCgeneralhid(),icGeneralHEntity.getVbillcode());
}
List<GeneralBillVO.Childrenvo> ChildrenList = new ArrayList<>();
int i=1;
for (StockinOrderSearchResponse.StockinOrder.StockinB ofsTransferDetail : transferInOrders.getDetails()) {
GeneralBillVO.Childrenvo childrenvo = new GeneralBillVO.Childrenvo();
//cinventoryid 存货
childrenvo.setCinventoryid(ofsTransferDetail.getSkuCode());
//ninnum 实收数量
childrenvo.setNinnum(ofsTransferDetail.getReceivedQty());
//csourcetype 来源单据类型编码
childrenvo.setCsourcetype("4Y");
//vsourcebillcode 来源单据号
childrenvo.setVsourcebillcode(icGeneralHEntity.getVbillcode());
for (IcGeneralBEntity icGeneralBEntity : icGeneralBEntityList) {
System.out.println(icGeneralBEntity);
//根据存货+行号匹配
if(ofsTransferDetail.getRefOrderDetailId().equals(icGeneralBEntity.getPkDefdoc20().trim())&&ofsTransferDetail.getSkuCode().equals(icGeneralBEntity.getCinvbascode())){
//crowno 行号
childrenvo.setCrowno(i++ +"0");
//vsourcerowno 来源单据行号
childrenvo.setVsourcerowno(icGeneralBEntity.getCrowno());
break;
}
}
ChildrenList.add(childrenvo);
}
generalBillVO.setParentvo(parentvo);
@ -281,7 +313,8 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
mapStr = "{\"GeneralBillVO\":[" + JSONUtil.toJsonStr(generalBillVO) + "]}";
ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("approveqzCode"), mapStr);
ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("approveInqzCode"), mapStr);
// ZTResult ztResult = pushU8CByApiCode.pushByCode(null, mapStr);
System.out.println(ztResult);
//两层判断,一层中台转发,一层u8c返回
if ("false".equals(ztResult.getFlag())) {
@ -329,8 +362,12 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
e.printStackTrace();
logger.error("推送U8C丽知OFS调拨入库订单--->U8C调拨入库订单保存签字关联U8C调拨出库单失败失败原因" + e);
ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class);
String ErrMessage = "推送U8C丽知OFS调整入库--->U8C其它入库失败失败原因" + reusltStrDto.getErrormsg();
String ErrMessage=null;
if (reusltStrDto != null) {
ErrMessage = "推送U8C丽知OFS调整入库--->U8C其它入库失败失败原因" + reusltStrDto.getErrormsg();
}else {
ErrMessage=e.getMessage();
}
//失败
IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity();
integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N);
@ -429,12 +466,12 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
/**
* 根据调拨出库单主表主键查询调拨出库单子表
*/
public List<IcGeneralBEntity> queryIcGeneralBByVsourcebillcode(String vsourcebillcode){
IcGeneralBEntity icGeneralBEntity = new IcGeneralBEntity();
icGeneralBEntity.setDr(0);
icGeneralBEntity.setVsourcebillcode(vsourcebillcode);
icGeneralBEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
List<IcGeneralBEntity> icGeneralBEntityList = icGeneralBDao.query(icGeneralBEntity);
public List<IcGeneralBEntity> queryIcGeneralBByCgeneralhid(String cgeneralhid){
// IcGeneralBEntity icGeneralBEntity = new IcGeneralBEntity();
// icGeneralBEntity.setDr(0);
// icGeneralBEntity.setCgeneralhid(cgeneralhid);
// icGeneralBEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
List<IcGeneralBEntity> icGeneralBEntityList = icGeneralBDao.queryAndCinvbasCode(cgeneralhid);
if (icGeneralBEntityList==null||icGeneralBEntityList.size() == 0) {
return null;
}

View File

@ -285,6 +285,10 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
//nnum 数量
children.setNnum(BigDecimal.valueOf(ofsDetail.getShipQty()));
childrenvo.add(children);
//ofs行id
children.setPk_defdoc20(ofsDetail.getId());
}
billVO.setParentvo(parentvo);
billVO.setChildrenvo(childrenvo);

View File

@ -40,7 +40,7 @@ public class TransferTest {
@Test
public void t10(){
transferOutPluginInitializer.start("LETS-SH2024082000000005");
transferOutPluginInitializer.start("LETS-SH2024082100000007");
}
@Test
@ -55,7 +55,7 @@ public class TransferTest {
}
@Test
public void t21(){
transferInPluginInitializer.start("LETS-RE2024082000000006");
transferInPluginInitializer.start("LETS-RE2024082100000005");
}

View File

@ -84,7 +84,7 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
@Data
public class OFSTranseferB{
/** id */
private Integer id;
private String id;
/** 订单ID */
private Integer transferOrderId;
/** 订单编号 */