|
@@ -1440,11 +1440,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
public int addInwardOrder(Map<String, Object> mapValue) {
|
|
|
int result = 0;
|
|
|
List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
|
|
|
- String planId = (String) mapValue.get("planId");
|
|
|
- Integer lineId = (Integer) mapValue.get("lineId");
|
|
|
- String orderType = (String) mapValue.get("orderType");
|
|
|
+ BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId")) ;
|
|
|
+ BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId")) ;
|
|
|
+ BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType")) ;
|
|
|
Integer carrierId = (Integer) mapValue.get("carrierId");
|
|
|
- AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
|
|
|
+ AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
|
|
|
amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
|
|
|
result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
|
|
|
for (Map<String,Object> orderMap : mapList) {
|
|
@@ -1466,7 +1466,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
orderIdMap.put("orderId",orderId);
|
|
|
tmsTruckFeign.addTotalResult(orderIdMap);
|
|
|
omstruckOrder.setOrderId(orderId);
|
|
|
- omstruckOrder.setOrderPlanId(new BigDecimal(planId));
|
|
|
+ omstruckOrder.setOrderPlanId(planId);
|
|
|
String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
|
|
|
omstruckOrder.setOrderNumber(orderNumber);
|
|
|
omstruckOrder.setOrderIssueTime(new Date());
|
|
@@ -1478,13 +1478,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
omstruckOrder.setUpdateUsername("admin");
|
|
|
omstruckOrder.setInsertUpdateRemark("无");
|
|
|
omstruckOrder.setDeleted(new BigDecimal(0));
|
|
|
- omstruckOrder.setOrderType(new BigDecimal(orderType));
|
|
|
+ omstruckOrder.setOrderType(orderType);
|
|
|
if(lineId != null){
|
|
|
- omstruckOrder.setLineId(new BigDecimal(lineId));
|
|
|
+ omstruckOrder.setLineId(lineId);
|
|
|
}
|
|
|
omstruckOrder.setCarrierId(new BigDecimal(carrierId));
|
|
|
result +=omstruckOrderMapper.insertSelective(omstruckOrder);
|
|
|
-
|
|
|
for (Map<String,Object>orderMaterial:orderMaterialList
|
|
|
) {
|
|
|
OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
|