wms / wms_shandonghaiwang · Commits

Commit 2960b8156a5a9a5d02bb9fb8ede4e31ae0f7dd7c

Authored by tongzhonghao
1 parent 3f23cf6e

整理if语句

Inline Side-by-side
Showing 1 changed file with 36 additions and 15 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
  View file @2960b81
... ... @@ -103,8 +103,9 @@ public class MesReceiptController extends BaseController {
103 103 }
104 104  
105 105 ReceiptHeader receiptHeader = new ReceiptHeader();
106   - if(StringUtils.isNotEmpty(header.getMOMID()))
  106 + if(StringUtils.isNotEmpty(header.getMOMID())){
107 107 receiptHeader.setMOMID(header.getMOMID());
  108 + }
108 109 receiptHeader.setCode(header.getReferCode());
109 110 // 入库类型--需要保持一致
110 111 receiptHeader.setReceiptType(header.getRefeCodeType());
... ... @@ -131,8 +132,9 @@ public class MesReceiptController extends BaseController {
131 132 LambdaQueryWrapper<Material> materialQueryWrapper = Wrappers.lambdaQuery();
132 133 materialQueryWrapper.eq(Material::getCode, detail.getMaterialCode());
133 134 Material material = materialService.getOne(materialQueryWrapper);
134   - if(StringUtils.isNotEmpty(detail.getDetailID()))
  135 + if(StringUtils.isNotEmpty(detail.getDetailID())){
135 136 receiptDetail.setMOMID(detail.getDetailID());
  137 + }
136 138 receiptDetail.setIsVirtualBom(detail.getIsVirtual());
137 139 receiptDetail.setMaterialCode(detail.getMaterialCode());
138 140 receiptDetail.setMaterialName(detail.getMaterialName());
... ... @@ -171,12 +173,15 @@ public class MesReceiptController extends BaseController {
171 173  
172 174 AjaxResult ajaxResult = new AjaxResult();
173 175 boolean inNull = enterIsNull(ajaxResult, header, details);
174   - if (inNull) return ajaxResult;
  176 + if (inNull){
  177 + return ajaxResult;
  178 + }
175 179  
176 180 ShipmentHeader shipmentHeader = new ShipmentHeader();
177 181 // shipmentHeader.setId(header.getId());
178   - if(StringUtils.isNotEmpty(header.getMOMID()))
  182 + if(StringUtils.isNotEmpty(header.getMOMID())) {
179 183 shipmentHeader.setMOMID(header.getMOMID());
  184 + }
180 185 shipmentHeader.setCode(header.getReferCode());
181 186 // 出库类型--需要保持一致
182 187 shipmentHeader.setShipmentType(header.getRefeCodeType());
... ... @@ -201,8 +206,9 @@ public class MesReceiptController extends BaseController {
201 206 List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
202 207 details.forEach(detail->{
203 208 ShipmentDetail shipmentDetail = new ShipmentDetail();
204   - if(StringUtils.isNotEmpty(detail.getDetailID()))
  209 + if(StringUtils.isNotEmpty(detail.getDetailID())){
205 210 shipmentDetail.setMOMID(detail.getDetailID());
  211 + }
206 212 shipmentDetail.setMaterialCode(detail.getMaterialCode());
207 213 shipmentDetail.setMaterialName(detail.getMaterialName());
208 214 shipmentDetail.setPort(detail.getEndSation());
... ... @@ -253,7 +259,9 @@ public class MesReceiptController extends BaseController {
253 259 */
254 260 private boolean enterIsNull(AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails){
255 261  
256   - if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)) return true;
  262 + if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)){
  263 + return true;
  264 + }
257 265  
258 266 if (StringUtils.isEmpty(shipmentHeader.getRefeCodeType())) {
259 267 ajaxResult.setCode(RetCode.FAIL).setMsg("单据类型不能为空!!!");
... ... @@ -282,7 +290,9 @@ public class MesReceiptController extends BaseController {
282 290 * @param shipemtnDetails
283 291 */
284 292 private boolean outIsNull (AjaxResult ajaxResult, Header shipmentHeader, List<Detail> shipemtnDetails){
285   - if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)) return true;
  293 + if (isNullData(ajaxResult, shipmentHeader, shipemtnDetails)){
  294 + return true;
  295 + }
286 296  
287 297 if (StringUtils.isEmpty(shipmentHeader.getReferCode())) {
288 298 ajaxResult.setCode(RetCode.FAIL).setMsg("单据单号不能为空!!!");
... ... @@ -320,7 +330,9 @@ public class MesReceiptController extends BaseController {
320 330 Header header = receiptDTO.getShipmentHeader();
321 331 List<Detail> details = receiptDTO.getShipemtnDetails();
322 332  
323   - if (StringUtils.isEmpty(header.getReferCode())) return AjaxResult.error().setMsg("单据单号不能为空!!!");
  333 + if (StringUtils.isEmpty(header.getReferCode())){
  334 + return AjaxResult.error().setMsg("单据单号不能为空!!!");
  335 + }
324 336 for (Detail detailIsNull:details){
325 337 if(StringUtils.isEmpty(detailIsNull.getDetailID())){
326 338 return AjaxResult.error().setMsg("单据明细ID不能为空!!!");
... ... @@ -331,15 +343,17 @@ public class MesReceiptController extends BaseController {
331 343 LambdaQueryWrapper<ReceiptHeader> receiptHeaderWrapper = Wrappers.lambdaQuery();
332 344 receiptHeaderWrapper.eq(ReceiptHeader::getId, header.getId());
333 345 ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderWrapper);
334   - if (receiptHeader == null)
  346 + if (receiptHeader == null) {
335 347 return AjaxResult.error().setMsg("没有找到对应单据!!!");
  348 + }
336 349 // 查询入库单据明细
337 350 LambdaQueryWrapper<ReceiptDetail> receiptDetailWrapper = Wrappers.lambdaQuery();
338 351 receiptDetailWrapper.eq(ReceiptDetail::getReceiptId, receiptHeader.getId());
339 352  
340 353 List<ReceiptDetail> receiptDetailList = receiptDetailService.list(receiptDetailWrapper);
341   - if (receiptDetailList == null)
  354 + if (receiptDetailList == null) {
342 355 return AjaxResult.error().setMsg("没有找到对应单据明细!!!");
  356 + }
343 357 // 获取删除明细
344 358 List<ReceiptDetail> removeReceiptDetails = new ArrayList<>();
345 359 receiptDetailList.forEach(receiptDetail-> details.forEach(detail->{
... ... @@ -377,20 +391,24 @@ public class MesReceiptController extends BaseController {
377 391 List<Detail> details = receiptDTO.getShipemtnDetails();
378 392  
379 393 AjaxResult ajaxResult = isNull(header, details);
380   - if (StringUtils.isNotEmpty(ajaxResult.getMsg())) return ajaxResult;
  394 + if (StringUtils.isNotEmpty(ajaxResult.getMsg())){
  395 + return ajaxResult;
  396 + }
381 397  
382 398 // 查询出库单据表头
383 399 LambdaQueryWrapper<ShipmentHeader> shipmentHeaderWrapper = Wrappers.lambdaQuery();
384 400 shipmentHeaderWrapper.eq(ShipmentHeader::getCode, header.getSuperiorCode());
385 401 ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(shipmentHeaderWrapper);
386   - if (shipmentHeader == null)
  402 + if (shipmentHeader == null) {
387 403 return ajaxResult.setCode(RetCode.FAIL).setMsg("没有找到对应单据!!!");
  404 + }
388 405 // 查询出库单据明细
389 406 LambdaQueryWrapper<ShipmentDetail> shipmentDetailWrapper = Wrappers.lambdaQuery();
390 407 shipmentDetailWrapper.eq(ShipmentDetail::getShipmentId, header.getId());
391 408 List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(shipmentDetailWrapper);
392   - if (shipmentDetailList == null)
  409 + if (shipmentDetailList == null) {
393 410 return ajaxResult.setCode(RetCode.FAIL).setMsg("没有找到对应单据明细!!!");
  411 + }
394 412 // 获取删除明细
395 413 List<ShipmentDetail> removeShipmentDetails = new ArrayList<>();
396 414 shipmentDetailList.forEach(shipmentDetai-> details.forEach(detail->{
... ... @@ -422,7 +440,9 @@ public class MesReceiptController extends BaseController {
422 440 ajaxResult.setCode(RetCode.FAIL).setMsg("总数量不能为空!!!");
423 441 }
424 442 });
425   - if (isNull || StringUtils.isNotEmpty(ajaxResult.getMsg())) return ajaxResult;
  443 + if (isNull || StringUtils.isNotEmpty(ajaxResult.getMsg())){
  444 + return ajaxResult;
  445 + }
426 446 return ajaxResult;
427 447 }
428 448  
... ... @@ -559,8 +579,9 @@ public class MesReceiptController extends BaseController {
559 579 @CrossOrigin
560 580 public AjaxResult kanbanInfo(@RequestBody TaskDetail taskDetail){
561 581 String fromLocation = taskDetail.getFromLocation();
562   - if (StringUtils.isEmpty(fromLocation))
  582 + if (StringUtils.isEmpty(fromLocation)) {
563 583 return AjaxResult.error("站台不能为空!!!");
  584 + }
564 585 LambdaQueryWrapper<TaskDetail> wrapper = Wrappers.lambdaQuery();
565 586 wrapper.eq(TaskDetail::getFromLocation, fromLocation)
566 587 .lt(TaskDetail::getStatus,"100");
... ...