|
|
@@ -55,11 +55,11 @@ public class PlatformWarehouseServiceImpl implements IPlatformWarehouseService {
|
|
|
List<Map<String,Object>> orderMaterialList = rmsPwarehouseGridMapper.getOrderMaterialList(orderId);
|
|
|
map.put("orderMaterialList",orderMaterialList);
|
|
|
//修改发站
|
|
|
- try{
|
|
|
- rmsPwarehouseGridMapper.updateSendStationId(map);
|
|
|
- }catch (Exception e){
|
|
|
- System.out.println("修改发站失败");
|
|
|
- }
|
|
|
+ //try{
|
|
|
+ // rmsPwarehouseGridMapper.updateSendStationId(map);
|
|
|
+ //}catch (Exception e){
|
|
|
+ // System.out.println("修改发站失败");
|
|
|
+ //}
|
|
|
//2.做判断,是否填写车皮号
|
|
|
if(wagonNo != null && !"".equals(wagonNo) && !"null".equals(wagonNo)){
|
|
|
//2.1 如果填写了车皮号,则代表入库的同时出库,出库则需要将火车和汽车绑定起来,这是最重要的一点,其他不变
|
|
|
@@ -237,8 +237,9 @@ public class PlatformWarehouseServiceImpl implements IPlatformWarehouseService {
|
|
|
throw new Exception(e.getMessage());
|
|
|
}
|
|
|
}
|
|
|
+ int i = 0;
|
|
|
//根据运输订单ID,出库
|
|
|
- int i = wmspGridMaterialMapper.updateWgmByOrderId(orderId);
|
|
|
+ i += wmspGridMaterialMapper.updateWgmByOrderId(orderId);
|
|
|
i =+ wmspGridMaterialMapper.updateRmsPg(personnelSsoId,orderId);
|
|
|
//同步生成火运实绩
|
|
|
try {
|
luobang