|
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
|
|
import com.steerinfo.dil.feign.BmsTruckFeign;
|
|
import com.steerinfo.dil.feign.BmsTruckFeign;
|
|
import com.steerinfo.dil.feign.ColumnDataFeign;
|
|
import com.steerinfo.dil.feign.ColumnDataFeign;
|
|
import com.steerinfo.dil.feign.OmsFeign;
|
|
import com.steerinfo.dil.feign.OmsFeign;
|
|
|
|
+import com.steerinfo.dil.feign.TmstruckFeign;
|
|
import com.steerinfo.dil.mapper.WmspInboundResultMapper;
|
|
import com.steerinfo.dil.mapper.WmspInboundResultMapper;
|
|
import com.steerinfo.dil.model.*;
|
|
import com.steerinfo.dil.model.*;
|
|
import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
|
|
import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
|
|
@@ -65,6 +66,8 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
|
|
@Autowired
|
|
@Autowired
|
|
BmsTruckFeign bmsTruckFeign;
|
|
BmsTruckFeign bmsTruckFeign;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ TmstruckFeign tmstruckFeign;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 1.新增扫描吊牌实绩!!!此时入库实绩未生成
|
|
* 1.新增扫描吊牌实绩!!!此时入库实绩未生成
|
|
@@ -101,6 +104,8 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
|
|
}
|
|
}
|
|
//返回新建的扫码实绩数据
|
|
//返回新建的扫码实绩数据
|
|
List<Map<String,Object>> mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
|
|
List<Map<String,Object>> mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
|
|
|
|
+ //新增卸货实绩
|
|
|
|
+ tmstruckFeign.updateUnloadResult(order);
|
|
//关闭运输订单
|
|
//关闭运输订单
|
|
omsFeign.closeSteelOrderType4(DataChange.dataToBigDecimal(orderId));
|
|
omsFeign.closeSteelOrderType4(DataChange.dataToBigDecimal(orderId));
|
|
//生成计费详单
|
|
//生成计费详单
|