优化采购

java110-bean/src/main/java/com/java110/dto/purchase/PurchaseApplyDetailDto.java

@@ -7,36 +7,62 @@ import java.util.List;
 
 //采购明细表
 public class PurchaseApplyDetailDto extends PageDto implements Serializable {
+
+    private String id;
     private String applyOrderId;
+    private String statusCd;
+
     private String resId;
-    private String quantity;
+    private String rsId;
+    private String resName;
     private String remark;
+    private String  quantity;
+    private String  purchaseQuantity;
+    private String  purchaseRemark;
+    private String price;
+    private String  resOrderType;
+    private String  userId;
+    private String  userName;
+    private String description;
+    private String state;
+    private String  endUserName;
+    private String  endUserTel;
+    private String  warehousingWay;
+    private String  createTime;
+    private String  supplierName;
+    private String  resOrderTypeName;
+    private String  stateName;
+    private String  warehousingWayName;
+    private String  rstName;
+    private String  parentRstName;
+    private String  specName;
+    private String  shId;
+    private String  unitCodeName;
+    private String  miniUnitCodeName;
+    private String  shName;
+    private String  isFixed;
+    private String  isFixedName;
+
+
     private List<String> applyOrderIds;
-    private String resName;
+
     private String resCode;
-    private String price;
+
     private String stock;
-    private String purchaseQuantity;
-    private String purchaseRemark;
+
     private String purchasePrice;
-    private String id;
-    private String rstName;
-    private String parentRstName;
-    private String specName;
+
     private String standardPrice;
     private String originalStock;
-    private String supplierName;
-    private String unitCodeName;
-    private String miniUnitCodeName;
+
     private String consultPrice;
     private String timesId;
 
-    private String userId;
     private String createUserId;
 
-    private String resOrderType;
 
-    private String rsId;
+
+    private String storeId;
 
     public String getApplyOrderId() {
         return applyOrderId;
@@ -253,6 +279,134 @@ public class PurchaseApplyDetailDto extends PageDto implements Serializable {
     public void setResOrderType(String resOrderType) {
         this.resOrderType = resOrderType;
     }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getEndUserName() {
+        return endUserName;
+    }
+
+    public void setEndUserName(String endUserName) {
+        this.endUserName = endUserName;
+    }
+
+    public String getEndUserTel() {
+        return endUserTel;
+    }
+
+    public void setEndUserTel(String endUserTel) {
+        this.endUserTel = endUserTel;
+    }
+
+    public String getWarehousingWay() {
+        return warehousingWay;
+    }
+
+    public void setWarehousingWay(String warehousingWay) {
+        this.warehousingWay = warehousingWay;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getResOrderTypeName() {
+        return resOrderTypeName;
+    }
+
+    public void setResOrderTypeName(String resOrderTypeName) {
+        this.resOrderTypeName = resOrderTypeName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getWarehousingWayName() {
+        return warehousingWayName;
+    }
+
+    public void setWarehousingWayName(String warehousingWayName) {
+        this.warehousingWayName = warehousingWayName;
+    }
+
+    public String getShId() {
+        return shId;
+    }
+
+    public void setShId(String shId) {
+        this.shId = shId;
+    }
+
+    public String getShName() {
+        return shName;
+    }
+
+    public void setShName(String shName) {
+        this.shName = shName;
+    }
+
+    public String getIsFixed() {
+        return isFixed;
+    }
+
+    public void setIsFixed(String isFixed) {
+        this.isFixed = isFixed;
+    }
+
+    public String getIsFixedName() {
+        return isFixedName;
+    }
+
+    public void setIsFixedName(String isFixedName) {
+        this.isFixedName = isFixedName;
+    }
 }
 
 

java110-bean/src/main/java/com/java110/vo/api/purchaseApplyDetail/ApiPurchaseApplyDetailDataVo.java

@@ -1,54 +1,64 @@
 package com.java110.vo.api.purchaseApplyDetail;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class ApiPurchaseApplyDetailDataVo implements Serializable {
 
-    private String operate;
+
+    private String id;
     private String applyOrderId;
     private String statusCd;
-    private String id;
-    private String bId;
+
     private String resId;
+    private String rsId;
     private String resName;
-    private String createTime;
-    private String quantity;
-    private String price;
-    private String purchaseQuantity;
-    private String purchaseRemark;
-    private String resOrderType;
-    private String resOrderTypeName;
     private String remark;
-    private String userId;
-    private String userName;
+    private String  quantity;
+    private String  purchaseQuantity;
+    private String  purchaseRemark;
+    private String price;
+    private String  resOrderType;
+    private String  userId;
+    private String  userName;
     private String description;
     private String state;
-    private String stateName;
-    private String endUserName;
-    private String endUserTel;
-    private String warehousingWay;
-    private String warehousingWayName;
-    private String startTime;
-    private String endTime;
-    private String rsId;
-    private String supplierName;
-    private String rstName;
-    private String parentRstName;
-    private String specName;
-    private String shId;
-    private String shName;
-    private String unitCodeName;
-    private String miniUnitCodeName;
-    private String isFixed;
-    private String isFixedName;
+    private String  endUserName;
+    private String  endUserTel;
+    private String  warehousingWay;
+    private String  createTime;
+    private String  supplierName;
+    private String  resOrderTypeName;
+    private String  stateName;
+    private String  warehousingWayName;
+    private String  rstName;
+    private String  parentRstName;
+    private String  specName;
+    private String  shId;
+    private String  unitCodeName;
+    private String  miniUnitCodeName;
+    private String  shName;
+    private String  isFixed;
+    private String  isFixedName;
 
-    public String getOperate() {
-        return operate;
-    }
+    private String resCode;
+
+    private String stock;
+
+    private String purchasePrice;
+
+    private String standardPrice;
+    private String originalStock;
+
+    private String consultPrice;
+    private String timesId;
+
+    private String createUserId;
+
+
+
+    private String storeId;
 
-    public void setOperate(String operate) {
-        this.operate = operate;
-    }
 
     public String getApplyOrderId() {
         return applyOrderId;
@@ -74,13 +84,7 @@ public class ApiPurchaseApplyDetailDataVo implements Serializable {
         this.id = id;
     }
 
-    public String getBId() {
-        return bId;
-    }
 
-    public void setBId(String bId) {
-        this.bId = bId;
-    }
 
     public String getResId() {
         return resId;
@@ -90,13 +94,6 @@ public class ApiPurchaseApplyDetailDataVo implements Serializable {
         this.resId = resId;
     }
 
-    public String getbId() {
-        return bId;
-    }
-
-    public void setbId(String bId) {
-        this.bId = bId;
-    }
 
     public String getResName() {
         return resName;
@@ -242,21 +239,7 @@ public class ApiPurchaseApplyDetailDataVo implements Serializable {
         this.remark = remark;
     }
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
 
     public String getRsId() {
         return rsId;
@@ -345,4 +328,76 @@ public class ApiPurchaseApplyDetailDataVo implements Serializable {
     public void setIsFixedName(String isFixedName) {
         this.isFixedName = isFixedName;
     }
+
+    public String getResCode() {
+        return resCode;
+    }
+
+    public void setResCode(String resCode) {
+        this.resCode = resCode;
+    }
+
+    public String getStock() {
+        return stock;
+    }
+
+    public void setStock(String stock) {
+        this.stock = stock;
+    }
+
+    public String getPurchasePrice() {
+        return purchasePrice;
+    }
+
+    public void setPurchasePrice(String purchasePrice) {
+        this.purchasePrice = purchasePrice;
+    }
+
+    public String getStandardPrice() {
+        return standardPrice;
+    }
+
+    public void setStandardPrice(String standardPrice) {
+        this.standardPrice = standardPrice;
+    }
+
+    public String getOriginalStock() {
+        return originalStock;
+    }
+
+    public void setOriginalStock(String originalStock) {
+        this.originalStock = originalStock;
+    }
+
+    public String getConsultPrice() {
+        return consultPrice;
+    }
+
+    public void setConsultPrice(String consultPrice) {
+        this.consultPrice = consultPrice;
+    }
+
+    public String getTimesId() {
+        return timesId;
+    }
+
+    public void setTimesId(String timesId) {
+        this.timesId = timesId;
+    }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
 }

service-store/src/main/java/com/java110/store/cmd/purchaseApplyDetail/ListPurchaseApplyDetailsCmd.java

@@ -2,6 +2,7 @@ package com.java110.store.cmd.purchaseApplyDetail;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -38,19 +39,9 @@ public class ListPurchaseApplyDetailsCmd extends Cmd {
 
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String storeId = CmdContextUtils.getStoreId(context);
         PurchaseApplyDetailDto purchaseApplyDetailDto = BeanConvertUtil.covertBean(reqJson, PurchaseApplyDetailDto.class);
-        //是否具有查看所有出入库明细的权限
-        String userId = reqJson.getString("userId");
-        BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
-        basePrivilegeDto.setResource("/viewAllPurchaseApplyDetail");
-        basePrivilegeDto.setUserId(userId);
-        List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
-        purchaseApplyDetailDto.setUserId("");//申请人
-        if (privileges.size() != 0) {
-            purchaseApplyDetailDto.setUserId("");//创建人
-        } else {
-            purchaseApplyDetailDto.setCreateUserId(userId);//创建人
-        }
+        purchaseApplyDetailDto.setStoreId(storeId);
         int count = purchaseApplyDetailInnerServiceSMOImpl.queryPurchaseApplyDetailsCount(purchaseApplyDetailDto);
         List<ApiPurchaseApplyDetailDataVo> purchaseApplyDetails = null;
         if (count > 0) {