java110
2023-06-28 7cd9cc73b6bbae05e8fa734e29f6cd435e2599ba
service-store/src/main/java/com/java110/store/cmd/purchaseApply/ListPurchaseApplysCmd.java
@@ -20,8 +20,8 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.dto.privilege.BasePrivilegeDto;
import com.java110.dto.resource.ResourceStoreDto;
import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
import com.java110.intf.community.IMenuInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
@@ -31,12 +31,11 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import com.java110.vo.api.purchaseApply.ApiPurchaseApplyDataVo;
import com.java110.vo.api.purchaseApply.ApiPurchaseApplyVo;
import com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo;
import org.springframework.beans.factory.annotation.Autowired;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.purchase.PurchaseApplyDto;
import java.math.BigDecimal;
import java.util.List;
@@ -88,6 +87,7 @@
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(reqJson, PurchaseApplyDto.class);
        purchaseApplyDto.setUserName("");//解除与用户名相关问题
        //获取用户id
        String userId = reqJson.getString("userId");
        //采购申请、物品领用(管理员查看所有,员工查看当前用户相关)
@@ -135,7 +135,9 @@
                        purchaseApplyDetailVo.setIsFixedName(resourceStoreDtos.get(0).getIsFixedName());
                        //获取仓库名称
                        String shName = resourceStoreDtos.get(0).getShName();
                        String shId = resourceStoreDtos.get(0).getShId();
                        purchaseApplyDetailVo.setShName(shName);
                        purchaseApplyDetailVo.setShId(shId);
                        cursor++;
                        if (applyDetailList.size() > 1) {
                            resNames.append(cursor + ":" + purchaseApplyDetailVo.getResName() + "      ");