|
@@ -547,7 +547,7 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
+ //@Transactional(rollbackFor = Exception.class)
|
|
|
public int disorderlyOutbound(Map<String, Object> mapVal) throws Exception {
|
|
|
//需要获取几个因子,1.物资名称
|
|
|
String masterialName = (String) mapVal.get("materialName");
|
|
@@ -582,15 +582,6 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
if(DataChange.dataToBigDecimal(outMap.get("billMaterialStatus")).intValue() == 2){
|
|
|
return -4;
|
|
|
}
|
|
|
- //判断该车是否已全部出库 -- 查询该车待出库物资数量
|
|
|
- int outBoundingNum = wmspOutboundResultMapper.getOutBoundingNum(orderId);
|
|
|
- if(outBoundingNum -1 == 0){
|
|
|
- //代表全部出库,修改出库表和出库物资表的状态
|
|
|
- wmspOutboundResultMapper.updateStatus(DataChange.dataToBigDecimal(outMap.get("resultId")));
|
|
|
- wmspOutboundResultMapper.updateMaterialStatus(DataChange.dataToBigDecimal(outMap.get("resultMaterialId")));
|
|
|
- }else{
|
|
|
- wmspOutboundResultMapper.updateMaterialStatus(DataChange.dataToBigDecimal(outMap.get("resultMaterialId")));
|
|
|
- }
|
|
|
//通过ssoid去人员管理里面找loadId
|
|
|
BigDecimal loadId = wmspOutboundResultMapper.getLoadId(mapVal);
|
|
|
mapVal.put("loadStartTime",new Date());
|
|
@@ -601,6 +592,15 @@ public class WmspOutboundResultServiceImpl implements IWmspOutboundResultServic
|
|
|
String code = (String) returnMap.get("code");
|
|
|
if("200".equals(code)){
|
|
|
System.out.println("新增装车成功:" + mapVal.get("orderId"));
|
|
|
+ //判断该车是否已全部出库 -- 查询该车待出库物资数量
|
|
|
+ int outBoundingNum = wmspOutboundResultMapper.getOutBoundingNum(orderId);
|
|
|
+ if(outBoundingNum -1 == 0){
|
|
|
+ //代表全部出库,修改出库表和出库物资表的状态
|
|
|
+ wmspOutboundResultMapper.updateStatus(DataChange.dataToBigDecimal(outMap.get("resultId")));
|
|
|
+ wmspOutboundResultMapper.updateMaterialStatus(DataChange.dataToBigDecimal(outMap.get("resultMaterialId")));
|
|
|
+ }else{
|
|
|
+ wmspOutboundResultMapper.updateMaterialStatus(DataChange.dataToBigDecimal(outMap.get("resultMaterialId")));
|
|
|
+ }
|
|
|
}else {
|
|
|
throw new Exception("新增装车失败");
|
|
|
}
|