|
@@ -84,9 +84,9 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
|
|
|
System.out.println(map.get("resultMaterial"));
|
|
|
//订单类型为倒库,直接扫码所有并返回数据
|
|
|
Map<String,Object> order=wmsInboundScanResultService.getOrderTypeByNum((String)map.get("resultMaterial"));
|
|
|
- Integer orderType=DataChange.dataToBigDecimal(order.get("orderType")).intValue();
|
|
|
- BigDecimal orderId=DataChange.dataToBigDecimal(order.get("orderId"));
|
|
|
- if(orderType!=null && orderType == 25){
|
|
|
+ if(order !=null && order.get("orderType")!=null && DataChange.dataToBigDecimal(order.get("orderType")).intValue() == 25){
|
|
|
+ Integer orderType=DataChange.dataToBigDecimal(order.get("orderType")).intValue();
|
|
|
+ BigDecimal orderId=DataChange.dataToBigDecimal(order.get("orderId"));
|
|
|
//校验是否有装货实绩,若没有则不允许入库
|
|
|
Integer count=wmsInboundScanResultService.isExistLoad((String)map.get("resultMaterial"));
|
|
|
if(count==null|| count<=0){
|