|
|
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import com.usoftchina.saas.base.Result;
|
|
|
import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
|
|
|
+import com.usoftchina.saas.commons.api.CommonService;
|
|
|
import com.usoftchina.saas.commons.api.MaxnumberService;
|
|
|
import com.usoftchina.saas.commons.api.MessageLogService;
|
|
|
import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
|
|
|
@@ -50,6 +51,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
|
|
|
private MessageLogService messageLogService;
|
|
|
@Autowired
|
|
|
private WarehouseApi warehouseApi;
|
|
|
+ @Autowired
|
|
|
+ private CommonService commonService;
|
|
|
|
|
|
@Override
|
|
|
public ProdInOutFormDTO getFormData(Long id) {
|
|
|
@@ -95,7 +98,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
|
|
|
prodInOut.setCreateTime(new Date());
|
|
|
prodInOut.setPi_recordmanid(userId);
|
|
|
prodInOut.setPi_recorddate(new Date());
|
|
|
- prodInOut.setPi_recordman("TESTADMIN");
|
|
|
+ prodInOut.setPi_recordman(BaseContextHolder.getUserName());
|
|
|
|
|
|
if(prodInOut.getPi_date() == null){
|
|
|
prodInOut.setPi_date(new Date());
|
|
|
@@ -268,6 +271,9 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
|
|
|
if(!StringUtils.isEmpty(result)){
|
|
|
throw new BizException(BizExceptionCode.SALEOUT_POST_ERROR.getCode(),result.toString());
|
|
|
}else{
|
|
|
+ //更新审核人、审核时间
|
|
|
+ commonService.commonAudit("prodinout", "pi_id=" + prodInOutDTO.getId(), "pi_status",
|
|
|
+ "pi_statuscode", "pi_auditdate", "pi_auditman");
|
|
|
//记录日志
|
|
|
DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
|
|
|
//日志
|
guq