hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

丽知：调拨出入库修改。

This commit is contained in:
zhengyf 2024-08-27 15:55:14 +08:00
parent 6627fa7254
commit 0586cc4174
4 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java
View File

@ -360,7 +360,8 @@ public class TransferInPluginInitializer extends PluginBaseEntity {
//两层判断,一层中台转发,一层u8c返回 //两层判断,一层中台转发,一层u8c返回
if ("false".equals(ztResult.getFlag())) { if ("false".equals(ztResult.getFlag())) {
//转发失败 //转发失败
Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单.中台转发失败,失败原因:{}", ztResult.getMsg()); response=JSONUtil.toJsonStr(ztResult.getAttribute());
Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单.中台转发失败,失败原因:{}", response);
} }
Attribute attribute = ztResult.getAttribute(); Attribute attribute = ztResult.getAttribute();
System.out.println(attribute); System.out.println(attribute);

14
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java
View File

@ -305,8 +305,17 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
//vnote 备注 //vnote 备注
parentvo.setVnote(ofsTranseferOrder.getHeader().getNotes()); parentvo.setVnote(ofsTranseferOrder.getHeader().getNotes());
// //pk_defdoc1 ofs调出店铺
// parentvo.setPk_defdoc1(ofsTranseferOrder.getHeader().getCode());
// //pk_defdoc4 ofs调入店铺
// parentvo.setPk_defdoc4(ofsTranseferOrder.getHeader().getCode());
//pk_defdoc17 来源系统
parentvo.setPk_defdoc17(ProfilesActiveConstant.sourceSystem1);
//pk_defdoc19 OFS调拨订单号 //pk_defdoc19 OFS调拨订单号
parentvo.setPk_defdoc19(ofsTranseferOrder.getHeader().getCode()); parentvo.setPk_defdoc19(ofsTranseferOrder.getHeader().getCode());
//pk_defdoc20 OFS调拨订单 id
parentvo.setPk_defdoc20(ofsTranseferOrder.getHeader().getId());
//子表 //子表
List<OFSTranseferOrderSearchResponse.OFSTranseferOrder.OFSTranseferB> ofsDetails = ofsTranseferOrder.getDetails(); List<OFSTranseferOrderSearchResponse.OFSTranseferOrder.OFSTranseferB> ofsDetails = ofsTranseferOrder.getDetails();
@ -318,7 +327,7 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
//cinvbasid 存货基本档案 //cinvbasid 存货基本档案
children.setCinvbasid(ofsDetail.getSkuCode()); children.setCinvbasid(ofsDetail.getSkuCode());
//nnum 数量 //nnum 数量
children.setNnum(BigDecimal.valueOf(ofsDetail.getShipQty())); children.setNnum(BigDecimal.valueOf(Long.parseLong(ofsDetail.getShipQty())));
childrenvo.add(children); childrenvo.add(children);
//ofs行id //ofs行id
children.setPk_defdoc20(ofsDetail.getId()); children.setPk_defdoc20(ofsDetail.getId());
@ -333,7 +342,8 @@ public class TransferOutPluginInitializer extends PluginBaseEntity {
//两层判断,一层中台转发,一层u8c返回 //两层判断,一层中台转发,一层u8c返回
if ("false".equals(ztResult.getFlag())) { if ("false".equals(ztResult.getFlag())) {
//转发失败 //转发失败
Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）.中台转发失败,失败原因:{}", ztResult.getMsg()); response=JSONUtil.toJsonStr(ztResult.getAttribute());
Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）.中台转发失败,失败原因:{}", ztResult.getAttribute());
} }
Attribute attribute = ztResult.getAttribute(); Attribute attribute = ztResult.getAttribute();
System.out.println(attribute); System.out.println(attribute);

10
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java
View File

@ -40,13 +40,17 @@ public class TransferTest {
@Test @Test
public void t10(){ public void t10(){
transferOutPluginInitializer.start("LETS-SH2024082200000005"); transferOutPluginInitializer.start("LETS-SH2024082700000004");
} }
@Test @Test
public void t11(){ public void t11(){
transferOutPluginInitializer.start("2024-08-06","2024-08-11"); transferOutPluginInitializer.start("2024-08-06","2024-08-11");
} }
@Test
public void t12() throws Exception {
transferOutPluginInitializer.queryOfsTransderOrder("LETS-TH2024082700000002");
}
////////////////////////////////////////////////////////////////////////////////////调拨入库单 ////////////////////////////////////////////////////////////////////////////////////调拨入库单
@Test @Test
@ -55,7 +59,7 @@ public class TransferTest {
} }
@Test @Test
public void t21(){ public void t21(){
transferInPluginInitializer.start("LETS-RE2024082200000001"); transferInPluginInitializer.start("LETS-RE2024082700000003");
} }
@ -68,7 +72,7 @@ public class TransferTest {
} }
@Test @Test
public void t31(){ public void t31(){
adjustInPluginInitializer.start("LETS-RE2024082700000002"); adjustInPluginInitializer.start("LETS-RE2024082700000003");
} }
@Test @Test
public void t32(){ public void t32(){

36
service/src/main/java/com/hzya/frame/ttxofs/dto/ofsTransferOrderSearch/OFSTranseferOrderSearchResponse.java
View File

@ -17,7 +17,7 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
@Data @Data
public class OFSTranseferH{ public class OFSTranseferH{
/** id */ /** id */
private Integer id; private String id;
/** 组织 */ /** 组织 */
private String clientCode; private String clientCode;
/** 货主编码 */ /** 货主编码 */
@ -33,7 +33,7 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** 移动单类型 */ /** 移动单类型 */
private String orderType; private String orderType;
/** 状态 */ /** 状态 */
private Integer status; private String status;
/** 来源平台 */ /** 来源平台 */
private String sourcePlatformCode; private String sourcePlatformCode;
/** 上位订单id */ /** 上位订单id */
@ -43,17 +43,17 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** 承运人 */ /** 承运人 */
private String carrierCode; private String carrierCode;
/** 总行数 */ /** 总行数 */
private Integer totalLines; private String totalLines;
/** 总数量 */ /** 总数量 */
private Integer totalQty; private String totalQty;
/** 货品单位 */ /** 货品单位 */
private String quantityUM; private String quantityUM;
/** 总重量 */ /** 总重量 */
private Integer totalWeight; private String totalWeight;
/** 总体积 */ /** 总体积 */
private Integer totalVolume; private String totalVolume;
/** 总材积 */ /** 总材积 */
private Integer totalVolumeWeight; private String totalVolumeWeight;
/** 重量单位 OFS数据字典WEIGHT_UM */ /** 重量单位 OFS数据字典WEIGHT_UM */
private String weightUM; private String weightUM;
/** 体积单位 OFS数据字典VOLUME_UM */ /** 体积单位 OFS数据字典VOLUME_UM */
@ -71,11 +71,11 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** 业务发生渠道 B2C B2C/B2B B2B/NA NA */ /** 业务发生渠道 B2C B2C/B2B B2B/NA NA */
private String bizChannel; private String bizChannel;
/** */ /** */
private Date created; private String created;
/** */ /** */
private String createdBy; private String createdBy;
/** */ /** */
private Date lastUpdated; private String lastUpdated;
/** */ /** */
private String lastUpdatedBy; private String lastUpdatedBy;
/** 备注 */ /** 备注 */
@ -86,7 +86,7 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** id */ /** id */
private String id; private String id;
/** 订单ID */ /** 订单ID */
private Integer transferOrderId; private String transferOrderId;
/** 订单编号 */ /** 订单编号 */
private String transferOrderCode; private String transferOrderCode;
/** 企业编码 */ /** 企业编码 */
@ -100,11 +100,11 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** SKU 名称 */ /** SKU 名称 */
private String skuName; private String skuName;
/** 要求发货数量 */ /** 要求发货数量 */
private Integer requestQty; private String requestQty;
/** 发货数量 */ /** 发货数量 */
private Integer shipQty; private String shipQty;
/** 实收数量 */ /** 实收数量 */
private Integer recvQty; private String recvQty;
/** 来源订单id */ /** 来源订单id */
private String sourceOrderId; private String sourceOrderId;
/** 源订单号 */ /** 源订单号 */
@ -118,21 +118,21 @@ public class OFSTranseferOrderSearchResponse extends ReturnMessageBasics {
/** 库存状态 */ /** 库存状态 */
private String inventorySts; private String inventorySts;
/** 总重量 */ /** 总重量 */
private Integer totalWeight; private String totalWeight;
/** 总体积 */ /** 总体积 */
private Integer totalVolume; private String totalVolume;
/** 总材积 */ /** 总材积 */
private Integer totalVolumeWeight; private String totalVolumeWeight;
/** 重量单位 OFS数据字典WEIGHT_UM */ /** 重量单位 OFS数据字典WEIGHT_UM */
private String weightUM; private String weightUM;
/** 体积单位 OFS数据字典VOLUME_UM */ /** 体积单位 OFS数据字典VOLUME_UM */
private String volumeUM; private String volumeUM;
/** */ /** */
private Date created; private String created;
/** */ /** */
private String createdBy; private String createdBy;
/** */ /** */
private Date lastUpdated; private String lastUpdated;
/** */ /** */
private String lastUpdatedBy; private String lastUpdatedBy;
} }