优化出入库信息

jiazx0107@163.com

2023-06-29 d0c6c53ce449c422d7446c0406d0a711c76424f3

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java

@@ -19,6 +19,7 @@
import com.ld.igds.util.ContextUtil;

import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

@@ -79,10 +80,15 @@
     */
    @DataResolver
    public String saveInoutData(InoutData data) throws Exception {
        if (StringUtils.isEmpty(data.getId())) {
            return inoutManager.addInoutData(data);

        //将DoradoEntity 转换为普通Entity
       InoutData newData =  new InoutData();
        BeanUtils.copyProperties(data,newData);
    	
        if (StringUtils.isEmpty(newData.getId())) {
            return inoutManager.addInoutData(newData);
        } else {
            return inoutManager.updateInoutData(data);
            return inoutManager.updateInoutData(newData);
        }
    }

@@ -204,9 +210,7 @@
        InoutData data = new InoutData();
        data.setCompanyId(user.getCompanyId());
        data.setRegisterTime(new Date());
        data.setCompleteTime(new Date());
        data.setType(type);
        data.setIntelCard("0000");
        data.setRegisterUser(user.getCname());
        data.setDeptId(ContextUtil.subDeptId(user));
        data.setCheckUser(user.getCname());