purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决序列号的产品销售报错的bug

Browse Source
This commit is contained in:
季圣华
2019-08-08 21:49:52 +08:00
parent 4c5cea8ca5
commit fd1c7e1025
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erp_web/js/pages/materials/in_out.js
View File

@@ -3097,7 +3097,7 @@
if(tipInfo){ if(tipInfo){
if(tipInfo.code!=200){ if(tipInfo.code!=200){
$.messager.alert('提示', tipInfo.msg, 'error'); $.messager.alert('提示', tipInfo.msg, 'warning');
return; return;
} }
$.messager.alert('提示','保存成功！','info'); $.messager.alert('提示','保存成功！','info');
@@ -3146,7 +3146,7 @@
success: function (tipInfo){ success: function (tipInfo){
if(tipInfo){ if(tipInfo){
if(tipInfo.code!=200){ if(tipInfo.code!=200){
$.messager.alert('提示', tipInfo.msg, 'error'); $.messager.alert('提示', tipInfo.msg, 'warning');
return; return;
} }
$.messager.alert('提示','保存成功！','info'); $.messager.alert('提示','保存成功！','info');

35
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View File

@@ -426,28 +426,19 @@ public class SerialNumberService {
* @return void * @return void
*/ */
public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{ public void checkAndUpdateSerialNumber(DepotItem depotItem,User userInfo) throws Exception{
if(depotItem!=null){ if(depotItem!=null){
//查询商品下已分配的可用序列号数量 //查询商品下已分配的可用序列号数量
try{ int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD); //BasicNumber=OperNumber*ratio
//BasicNumber=OperNumber*ratio if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){
if((depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue()>SerialNumberSum){ //获取商品名称
//获取商品名称 Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid()); throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE, String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName())); }
} //商品下序列号充足，分配序列号
}catch(Exception e){ sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
logger.error("异常码[{}],异常提示[{}],异常[{}]", }
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);
throw new BusinessRunTimeException(ExceptionConstants.DATA_READ_FAIL_CODE,
ExceptionConstants.DATA_READ_FAIL_MSG);
}
//商品下序列号充足，分配序列号
sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),(depotItem.getBasicnumber()==null?0:depotItem.getBasicnumber()).intValue(),userInfo);
}
} }
/** /**
* *