|
|
@@ -6,6 +6,7 @@ import com.steerinfo.dil.model.*;
|
|
|
import com.steerinfo.dil.service.IOyeWarehouseService;
|
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
import com.steerinfo.dil.util.SaleLogUtil;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -153,6 +154,9 @@ public class OyeWarehouseServiceImpl implements IOyeWarehouseService {
|
|
|
BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
|
|
|
// 钢材米数
|
|
|
BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("meterNumber"));
|
|
|
+ if(StringUtils.isEmpty(inboundArea)){
|
|
|
+ inboundArea = map.get("inboundArea") == null ? null : map.get("inboundArea").toString();
|
|
|
+ }
|
|
|
if (materialId == null || materialId.intValue() == 0) {
|
|
|
String name = (String) map.get("materialName");
|
|
|
String specification = (String) map.get("materialSpecification");
|