feat: bug-813 零部件打包详情查询接口返回工厂编号
This commit is contained in:
parent
8a4e2de9d2
commit
99176cdca2
|
|
@ -190,9 +190,6 @@ public class ComponentPackingController {
|
||||||
List<ComponentPackingItemPdaVO> daVos = tasks.stream()
|
List<ComponentPackingItemPdaVO> daVos = tasks.stream()
|
||||||
.map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item))
|
.map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
daVos.forEach(vo -> {
|
|
||||||
vo.setFactoryNo(packing.getFactoryNo());
|
|
||||||
});
|
|
||||||
return ApiResult.success(daVos);
|
return ApiResult.success(daVos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,4 @@ public class ComponentPackingItemPdaVO {
|
||||||
public BigDecimal getRemainQty() {
|
public BigDecimal getRemainQty() {
|
||||||
return menge.subtract(outQty);
|
return menge.subtract(outQty);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 工厂
|
|
||||||
*/
|
|
||||||
private String factoryNo;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,4 +42,9 @@ public class ComponentPackingPdaVO {
|
||||||
* 设备名称
|
* 设备名称
|
||||||
*/
|
*/
|
||||||
private String maktx;
|
private String maktx;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 工厂
|
||||||
|
*/
|
||||||
|
private String factoryNo;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
<select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">
|
<select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">
|
||||||
select
|
select
|
||||||
id,no,vbeln,create_time,datum,vbelv,matnr,maktx
|
id,no,vbeln,create_time,datum,vbelv,matnr,maktx,factory_no
|
||||||
from wms_component_packing
|
from wms_component_packing
|
||||||
where is_completed=0
|
where is_completed=0
|
||||||
<if test="no !=null and no !=''">
|
<if test="no !=null and no !=''">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue