|
@@ -9,6 +9,7 @@ import com.steerinfo.dil.model.RmsMaterial;
|
|
|
import com.steerinfo.dil.model.RmsMaterialType;
|
|
import com.steerinfo.dil.model.RmsMaterialType;
|
|
|
import com.steerinfo.dil.model.RmsUnitOfMeasure;
|
|
import com.steerinfo.dil.model.RmsUnitOfMeasure;
|
|
|
import com.steerinfo.dil.service.IRmsMaterialService;
|
|
import com.steerinfo.dil.service.IRmsMaterialService;
|
|
|
|
|
+import com.steerinfo.dil.util.DataChange;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -141,21 +142,15 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public int insertMaterial(RmsMaterial rmsMaterial) {
|
|
public int insertMaterial(RmsMaterial rmsMaterial) {
|
|
|
- int i=0;
|
|
|
|
|
- String materialCode=rmsMaterial.getMaterialCode();
|
|
|
|
|
- int rmsMaterials=rmsMaterialMapper.selectMaterialByCode(materialCode);
|
|
|
|
|
- if (rmsMaterials==0){
|
|
|
|
|
|
|
+ String code="lx";
|
|
|
|
|
+ Integer id=rmsMaterialMapper.getMaterialId().intValue();
|
|
|
|
|
+ String materialCode=DataChange.generateEightDigitsNumber(code,id);
|
|
|
|
|
+ rmsMaterial.setMaterialCode(materialCode);
|
|
|
rmsMaterial.setDeleted(new BigDecimal(0));
|
|
rmsMaterial.setDeleted(new BigDecimal(0));
|
|
|
- rmsMaterial.setMaterialId(rmsMaterialMapper.getMaterialId());
|
|
|
|
|
|
|
+ rmsMaterial.setMaterialId(new BigDecimal(id));
|
|
|
rmsMaterial.setInsertTime(new Date());
|
|
rmsMaterial.setInsertTime(new Date());
|
|
|
rmsMaterial.setInsertUsername("admin");
|
|
rmsMaterial.setInsertUsername("admin");
|
|
|
- i += rmsMaterialMapper.insertSelective(rmsMaterial);
|
|
|
|
|
- }
|
|
|
|
|
- else{
|
|
|
|
|
- i=-1;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- return i;
|
|
|
|
|
|
|
+ return rmsMaterialMapper.insertSelective(rmsMaterial);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|