rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、零部件出库单测试完毕

This commit is contained in:
zhangke 2025-09-11 11:43:56 +08:00
parent afa1e756d4
commit 7a8f07ef76
9 changed files with 59 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentOutboundController.java
View File

@ -145,7 +145,7 @@ public class ComponentOutboundController {
.setItSernrPatch(new ArrayList<>())
.setItem(new ArrayList<>())
.setItSernr(new ArrayList<>())
.setItSernrPatch(new ArrayList<>())
.setItLipsItem(new ArrayList<>())
.setIType("A")
.setIvDelivery(packing.getVbelv());
for (ComponentOutboundItemInputQO item : request.getItems()) {

26
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java
View File

@ -8,6 +8,7 @@ import com.nflg.wms.admin.service.SapService;
import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.ZWM3A19DTO;
import com.nflg.wms.common.pojo.dto.ZWM3A19ITEMDTO;
import com.nflg.wms.common.pojo.dto.ZWM3A21QueryDTO;
import com.nflg.wms.common.pojo.qo.*;
import com.nflg.wms.common.pojo.vo.*;
@ -96,6 +97,31 @@ public class ComponentPackingController {
VUtil.trueThrowBusinessError(StrUtil.isBlank(result.getHeadDTO().getWbstk())
|| result.getHeadDTO().getWbstk().equalsIgnoreCase("C"))
.throwMessage("此交货单已完成了过账");
result.getHeadDTO().setGStreen("setGStreen");
result.getHeadDTO().setGStrSuppl2("setGStrSuppl2");
result.getHeadDTO().setTelNumber("setTelNumber");
result.getHeadDTO().setCnum("setCnum");
result.getHeadDTO().setHuodh("setHuodh");
result.getHeadDTO().setBname("setBname");
result.getHeadDTO().setMaktx("setMaktx");
result.getHeadDTO().setMatnr("setMatnr");
result.getHeadDTO().setSernr("setSernr");
result.getHeadDTO().setUname("setUname");
result.getHeadDTO().setXnum("setXnum");
result.getHeadDTO().setZchep("setZchep");
result.getHeadDTO().setZjshz("setZjshz");
result.getHeadDTO().setZjshz("setZjshz");
for (ZWM3A19ITEMDTO itemDTO : result.getItemDTOList())
{
itemDTO.setAtwrt("setAtwrt");
itemDTO.setLgort("setLgort");
itemDTO.setLgobe("setLgobe");
itemDTO.setLgpbe("setLgpbe");
itemDTO.setPotx2("setPotx2");
itemDTO.setZatwrt("setZatwrt");
itemDTO.setZtext("setZtext");
itemDTO.setZxiah("setZxiah");
}
return ApiResult.success(result);
}

12
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java
View File

@ -54,11 +54,11 @@ public class ComponentPackingControllerService {
wmsComponentPacking.setSernr(request.getSernr());
wmsComponentPacking.setHuodh(request.getHuodh());
wmsComponentPacking.setVbelv(request.getVbelv());
wmsComponentPacking.setPName(request.getPName());
wmsComponentPacking.setLBezei(request.getLBezei());
wmsComponentPacking.setLName(request.getLName());
wmsComponentPacking.setGStreen(request.getGStreen());
wmsComponentPacking.setGStrSuppl2(request.getGStrSuppl2());
wmsComponentPacking.setPName(request.getPname());
wmsComponentPacking.setLBezei(request.getLbezei());
wmsComponentPacking.setLName(request.getLname());
wmsComponentPacking.setGStreen(request.getGstreen());
wmsComponentPacking.setGStrSuppl2(request.getGstrSuppl2());
wmsComponentPacking.setWbstk(request.getWbstk());
wmsComponentPacking.setIsCompleted((short) 0);
wmsComponentPacking.setCreateName(UserUtil.getUserName());
@ -68,7 +68,7 @@ public class ComponentPackingControllerService {
List<WmsComponentPackingItem> wmsComponentPackingItems = request.getItems().stream()
.map(item -> new WmsComponentPackingItem()
.setId(IdUtil.getSnowflakeNextId())
.setItemIndex(item.getItemIndex())
.setItemIndex(item.getIndex())
.setVbeln(item.getVbeln())
.setPosnr(item.getPosnr())
.setIdnrk(item.getIdnrk())

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java
View File

@ -1196,6 +1196,7 @@ public class SapService {
* @return
*/
public Pair<String, String> zwm3a20(ZWM3A20DTO dto) {
// return Pair.of("Test", "TestYear");
Map<String, Object> parameters = new HashMap<>();
parameters.put("IV_DELIVERY", dto.getIvDelivery());
parameters.put("I_TYPE", dto.getIType());

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingInputQO.java
View File

@ -89,27 +89,27 @@ public class ComponentPackingInputQO {
/**
* 办事处代理商
*/
private String pName;
private String pname;
/**
* 装运类型的描述
*/
private String lBezei;
private String lbezei;
/**
* 收货单位-T
*/
private String lName;
private String lname;
/**
* 收货地址-T
*/
private String gStreen;
private String gstreen;
/**
* 收货人电话-
*/
private String gStrSuppl2;
private String gstrSuppl2;
/**
* A 没有处理 B部分处理 C 完全地处理

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ComponentPackingItemInputQO.java
View File

@ -11,7 +11,7 @@ public class ComponentPackingItemInputQO {
/**
* 循环，当前通过的编号
*/
private Integer itemIndex;
private Integer index;
/**
* 销售和分销凭证号序号

22
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentOutboundVO.java
View File

@ -1,7 +1,12 @@
package com.nflg.wms.common.pojo.vo;
import lombok.Data;
import lombok.experimental.Accessors;
import java.time.LocalDateTime;
@Data
@Accessors(chain = true)
public class ComponentOutboundVO {
/**
@ -119,11 +124,6 @@ public class ComponentOutboundVO {
*/
private String wbstk;
/**
* 是否完成入库
*/
private Boolean isCompleted;
/**
* 出库单号
*/
@ -138,4 +138,16 @@ public class ComponentOutboundVO {
* 所属工厂
*/
private String factoryNo;
private Long createId;
private String createName;
private LocalDateTime createTime;
private Long modifyId;
private String modifyName;
private LocalDateTime modifyTime;
}

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingVO.java
View File

@ -46,7 +46,7 @@ public class ComponentPackingVO {
/**
* 发货日期
*/
private LocalDate datum;
private LocalDateTime datum;
/**
* 箱号

2
nflg-wms-repository/src/main/resources/mapper/WmsComponentOutboundMapper.xml
View File

@ -5,7 +5,7 @@
<select id="search" resultType="com.nflg.wms.common.pojo.vo.ComponentOutboundVO">
select id,packing_no,
outbound_no,matnr,name1,uname,vbeln,maktx,datum,xnum,cnum,bname,zjshz,zchep,tel_number,sernr,huodh,vbelv,
p_name,l_bezei,l_name,g_streen,g_str_suppl2,wbstk,is_completed,create_name,create_time,factory_no
p_name,l_bezei,l_name,g_streen,g_str_suppl2,wbstk,create_name,create_time,factory_no,create_id,create_name,create_time
from wms_component_outbound
<where>
<if test="request.packingNo !=null and request.packingNo !=''">