Merge branch 'dev' into test

yun-zuoyi
peter.pan 6 years ago
commit 61ecc2a74f

@ -503,7 +503,11 @@ public class WmsEnumUtil {
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"), NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"), NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"), LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
AMPR(190, "AMPR", "AMPR"); ASN(190, "ASN", "ASN"),
PO(200, "PO", "PO"),
QC(210, "QC", "QC"),
AMPR(220, "AMPR", "AMPR");
private int value; private int value;
private String code; private String code;

@ -105,6 +105,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "状态", example = "0") @ApiParam(value = "状态", example = "0")
public Integer itemStatus; public Integer itemStatus;
@Column(name="REF_ITEM")
@ApiParam("关联单据行号")
public String refItem;
/** /**
* ASN,PO,SO * ASN,PO,SO
*/ */

Loading…
Cancel
Save