wms / wms_shandonghaiwang · Commits

Commit ff9ab922bd7e0b2ab776b9542bd2b0e29e4520fd

Authored by hh
1 parent 4ffed068

海王_入库单据类型MOM已经保持一致

Inline Side-by-side
Showing 2 changed files with 67 additions and 34 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
  View file @ff9ab92
... ... @@ -85,8 +85,7 @@ public class MesReceiptController extends BaseController {
85 85 receiptHeader.setMOMID(header.getMOMID());
86 86 receiptHeader.setCode(header.getReferCode());
87 87 // 入库类型--需要保持一致
88   - // receiptHeader.setReceiptType(header.getRefeCodeType());
89   - receiptHeader.setReceiptType("receipt");
  88 + receiptHeader.setReceiptType(header.getRefeCodeType());
90 89 // receiptHeader.setReceiptType("CS");
91 90 receiptHeader.setTotalQty(header.getTotalQty());
92 91 receiptHeader.setTotalLines(details.size());
... ... @@ -151,8 +150,7 @@ public class MesReceiptController extends BaseController {
151 150 shipmentHeader.setMOMID(header.getMOMID());
152 151 shipmentHeader.setCode(header.getReferCode());
153 152 // 出库类型--需要保持一致
154   - // shipmentHeader.setShipmentType(header.getRefeCodeType());OTF
155   - shipmentHeader.setShipmentType("OTF");
  153 + shipmentHeader.setShipmentType(header.getRefeCodeType());
156 154 shipmentHeader.setTotalQty(header.getTotalQty());
157 155 // TAID MOM目标类型 // FAID MOM来源类型
158 156 shipmentHeader.setTAID(header.getTAID());
... ... @@ -403,9 +401,7 @@ public class MesReceiptController extends BaseController {
403 401 String materialName = detailed.getMaterialName();
404 402 String materialCode = detailed.getMaterialCode();
405 403 String containerCode = detailed.getContainerCode();
406   - if(StringUtils.isEmpty(materialName) && StringUtils.isEmpty(materialCode) && StringUtils.isEmpty(containerCode)){
407   - return AjaxResult.error("物料名称、物料编码、托盘号不能同时为空！！！");
408   - }
  404 +
409 405 LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
410 406 // 物料编码
411 407 if (StringUtils.isNotEmpty(materialName)){
... ...
src/main/java/com/huaheng/api/mes/dto/Header.java
  View file @ff9ab92
... ... @@ -53,65 +53,102 @@ public class Header {
53 53 private String superiorCode;
54 54  
55 55 /**
  56 + * MOM来源类型
  57 + */
  58 + @ApiModelProperty(value="MOM来源类型")
  59 + private String FAID;
  60 +
  61 + /**
56 62 * 母件名称
57 63 */
58 64 @ApiModelProperty(value = "母件名称")
59 65 private String superiorName;
60 66  
  67 + public Integer getId() {
  68 + return id;
  69 + }
61 70  
62   - public String getWorkshop() {
63   - return workshop;
  71 + public void setId(Integer id) {
  72 + this.id = id;
64 73 }
65 74  
66   - public String getWarehouse() {
67   - return warehouse;
  75 + public String getMOMID() {
  76 + return MOMID;
68 77 }
69 78  
70   - public String getSuperiorCode() {
71   - return superiorCode;
  79 + public void setMOMID(String MOMID) {
  80 + this.MOMID = MOMID;
72 81 }
73 82  
74   - public String getSuperiorName() {
75   - return superiorName;
  83 + public String getReferCode() {
  84 + return referCode;
76 85 }
77 86  
78   - /**
79   - * MOM来源类型
80   - */
81   - @ApiModelProperty(value="MOM来源类型")
82   - private String FAID;
  87 + public void setReferCode(String referCode) {
  88 + this.referCode = referCode;
  89 + }
  90 +
  91 + public String getRefeCodeType() {
  92 + return refeCodeType;
  93 + }
  94 +
  95 + public void setRefeCodeType(String refeCodeType) {
  96 + this.refeCodeType = refeCodeType;
  97 + }
  98 +
  99 + public BigDecimal getTotalQty() {
  100 + return totalQty;
  101 + }
  102 +
  103 + public void setTotalQty(BigDecimal totalQty) {
  104 + this.totalQty = totalQty;
  105 + }
83 106  
84 107 public String getTAID() {
85 108 return TAID;
86 109 }
87 110  
88   - public String getMOMID() {
89   - return MOMID;
  111 + public void setTAID(String TAID) {
  112 + this.TAID = TAID;
90 113 }
91 114  
  115 + public String getWorkshop() {
  116 + return workshop;
  117 + }
92 118  
93   - public String getFAID() {
94   - return FAID;
  119 + public void setWorkshop(String workshop) {
  120 + this.workshop = workshop;
95 121 }
96 122  
97   - public BigDecimal getTotalQty() {
98   - return totalQty;
  123 + public String getWarehouse() {
  124 + return warehouse;
99 125 }
100 126  
101   - public Integer getId() {
102   - return id;
  127 + public void setWarehouse(String warehouse) {
  128 + this.warehouse = warehouse;
103 129 }
104 130  
105   - public void setId(Integer id) {
106   - this.id = id;
  131 + public String getSuperiorCode() {
  132 + return superiorCode;
107 133 }
108 134  
109   - public String getReferCode() {
110   - return referCode;
  135 + public void setSuperiorCode(String superiorCode) {
  136 + this.superiorCode = superiorCode;
111 137 }
112 138  
113   - public String getRefeCodeType() {
114   - return refeCodeType;
  139 + public String getFAID() {
  140 + return FAID;
  141 + }
  142 +
  143 + public void setFAID(String FAID) {
  144 + this.FAID = FAID;
  145 + }
  146 +
  147 + public String getSuperiorName() {
  148 + return superiorName;
115 149 }
116 150  
  151 + public void setSuperiorName(String superiorName) {
  152 + this.superiorName = superiorName;
  153 + }
117 154 }
... ...