Commit 5986f5a00acea1b2b3add09ea021f6cc2e480471
1 parent
d7a5c71a
去除出库组盘限制
Showing
2 changed files
with
7 additions
and
7 deletions
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
| @@ -139,12 +139,12 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont | @@ -139,12 +139,12 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont | ||
| 139 | if(unCompleteCombineNumber > 0) { | 139 | if(unCompleteCombineNumber > 0) { |
| 140 | throw new ServiceException("托盘：" + containerCode + " 已经用于入库组盘"); | 140 | throw new ServiceException("托盘：" + containerCode + " 已经用于入库组盘"); |
| 141 | } | 141 | } |
| 142 | - Container container = containerService.getContainerByCode(containerCode); | ||
| 143 | - if(container != null) { | ||
| 144 | - if(container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) { | ||
| 145 | - throw new ServiceException("托盘已经锁定，不能再组盘"); | ||
| 146 | - } | ||
| 147 | - } | 142 | + //Container container = containerService.getContainerByCode(containerCode); |
| 143 | + //if(container != null) { | ||
| 144 | + // if(container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) { | ||
| 145 | + // throw new ServiceException("托盘已经锁定，不能再组盘"); | ||
| 146 | + // } | ||
| 147 | + //} | ||
| 148 | //校验数量是否超出 | 148 | //校验数量是否超出 |
| 149 | if((shipmentDetail.getShipQty().subtract(shipmentDetail.getRequestQty())).compareTo(shipmentCombinationModel.getShipQty())<0){ | 149 | if((shipmentDetail.getShipQty().subtract(shipmentDetail.getRequestQty())).compareTo(shipmentCombinationModel.getShipQty())<0){ |
| 150 | throw new ServiceException("录入数量超出明细待出数量"); | 150 | throw new ServiceException("录入数量超出明细待出数量"); |
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
| @@ -336,7 +336,7 @@ | @@ -336,7 +336,7 @@ | ||
| 336 | actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传ERP</a>'); | 336 | actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="receive(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传ERP</a>'); |
| 337 | } | 337 | } |
| 338 | 338 | ||
| 339 | - if (row.firstStatus >= 500 && row.lastStatus >= 500 && row.shipmentType==='SCLLD' && row.mesSuccessStatus==='0'|| row.mesSuccessStatus==='2') { | 339 | + if (row.firstStatus >= 500 && row.lastStatus >= 500 && row.shipmentType==='SCLLD' && row.mesSuccessStatus!==1) { |
| 340 | actions.push('<a style="margin-left: 5px;background-color: #54b095" class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="toMes(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传MES</a>'); | 340 | actions.push('<a style="margin-left: 5px;background-color: #54b095" class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="toMes(\'' + row.id + '\')"><i class="fa fa-external-link"></i>回传MES</a>'); |
| 341 | } | 341 | } |
| 342 | return actions.join(''); | 342 | return actions.join(''); |