审批系统修改

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/AdminApprovalAuthority.java

@@ -9,10 +9,10 @@ public class AdminApprovalAuthority implements Serializable{
     private static final long serialVersionUID = -2284379645448758797L;
     private Integer authorityId;
     private Integer adminId;
-    private Integer isSales;
-    private Integer isPmc;
-    private Integer isManagement;
-    private Integer isWarehouse;
+    private Integer isSales;//是否是销售
+    private Integer isPmc;//是否是pmc
+    private Integer isManagement;//是否是优尼雅管理人员
+    private Integer isWarehouse;//是否是仓库
 
     public Integer getAuthorityId() {
         return authorityId;

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInfo.java

@@ -29,6 +29,7 @@ public class ApprovalInfo implements Serializable{
     private Integer selectType;//查询类型 1.我发起的 2.我审核的 3.仓库确认
     private String selectName;//查询内容 姓名 订单名称 备注
     private String adminName;//管理员姓名
+    private Integer selectState;// 1.待审核（包含部分审核） 2.已审核 3.待入库（包含部分入库） 4,已全部入库
 
     public Integer getApprovalId() {
         return approvalId;
@@ -181,4 +182,12 @@ public class ApprovalInfo implements Serializable{
     public void setAdminName(String adminName) {
         this.adminName = adminName;
     }
+
+    public Integer getSelectState() {
+        return selectState;
+    }
+
+    public void setSelectState(Integer selectState) {
+        this.selectState = selectState;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalInventoryRecords.java

@@ -25,6 +25,7 @@ public class ApprovalInventoryRecords implements Serializable {
     private String productModel;//产品型号
     private String productUnit;//单位
     private Integer productBoxNumber;//箱数/套数
+    private String externalModel ;//外部型号
 
     public Integer getStorageId() {
         return storageId;
@@ -153,4 +154,12 @@ public class ApprovalInventoryRecords implements Serializable {
     public void setProductBoxNumber(Integer productBoxNumber) {
         this.productBoxNumber = productBoxNumber;
     }
+
+    public String getExternalModel() {
+        return externalModel;
+    }
+
+    public void setExternalModel(String externalModel) {
+        this.externalModel = externalModel;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -260,6 +260,7 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
             records.setProductModel(productionItem.getItemProductModel());
             records.setProductUnit(productionItem.getItemProductUnit());
             records.setProductBoxNumber(productionItem.getItemProductBoxNumber());
+            records.setExternalModel(productionItem.getItemExternalModel());
             if(approvalOrderMapper.insertInventoryRecords(records) < 1){
                 return new ResponseJson(200, "添加入库记录失败", 500);
             }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -349,6 +349,18 @@
       <if test="approvalCreateTime != null and approvalCreateTime != ''">
         AND to_days(#{approvalCreateTime}) = to_days(ai.approval_create_time)
       </if>
+      <if test="selectState != null and selectState != '' and selectState == 1">
+        AND ai.approval_status in (1,4)
+      </if>
+      <if test="selectState != null and selectState != '' and selectState == 2">
+        AND ai.approval_status  = 2
+      </if>
+      <if test="selectState != null and selectState != '' and selectState == 3">
+        AND ai.approval_status in (2,6)
+      </if>
+      <if test="selectState != null and selectState != '' and selectState == 4">
+        AND ai.approval_status  = 7
+      </if>
     </where>
     group by ai.approval_id
     ORDER BY ai.approval_id DESC
@@ -566,14 +578,14 @@
     brand_name,
     product_model,
     product_unit,
-    product_box_number
-
+    product_box_number,
+    external_model
     )
     VALUES
     (#{approvalId},#{itemId},#{storageState},#{productId}
     ,#{productName},#{colorName},#{shouldStorage}
     ,#{actualStorage},#{lackNumber},#{operatingAdminId},NOW(),
-    #{brandName},#{productModel},#{productUnit},#{productBoxNumber})
+    #{brandName},#{productModel},#{productUnit},#{productBoxNumber},#{externalModel})
   </insert>
 
   <!--查询单个审批产品项信息-->
@@ -694,7 +706,8 @@
     brand_name brandName,
     product_model productModel,
     product_unit productUnit,
-    product_box_number productBoxNumber
+    product_box_number productBoxNumber,
+    external_model externalModel
     from tb_rst_approval_inventory_records
     where
     approval_id = #{approvalId}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -324,6 +324,7 @@ public class ApprovalController {
  * @param pageNO
  * @param totalNum
  * @param selectType 1.我发起的 2.我审核的 3.仓库确认
+ * @param
  * @return
  * @throws Exception
  */
@@ -357,6 +358,8 @@ public class ApprovalController {
                 }
             }
         }
+
+
         String stareDate = request.getParameter("stareDate");
         if(stareDate != null ){
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -589,4 +592,54 @@ public class ApprovalController {
         return rj;
     }
 
+    /**
+     * 查询待办数量
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getTo_do")
+    public ResponseJson getTo_do(HttpServletRequest request){
+        //获取openid,根据openid查询当前登录人信息
+        String openId = WechatUtils.getUserBySession(request).getUserOpenid();
+        Admin admin = sysService.getByOpenid(openId);
+        ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+        if(admin == null){
+            return new ResponseJson(200, "未查询到登录人信息", 500);
+        }
+        if(admin.getAdminDept() !=9){//9:优尼雅
+            return new ResponseJson(200, "不允许非优尼雅部门员工查询", 500);
+        }
+        AdminApprovalAuthority adminApprovalAuthority = approvalOrderService.getApprovalAuthority(admin.getAdminId());
+        if(adminApprovalAuthority == null){
+            return new ResponseJson(200, "未找到权限信息", 500);
+        }
+        ApprovalInfo approvalInfo = new ApprovalInfo();
+        approvalInfo.setApprovalAdminId(admin.getAdminId());
+        if(adminApprovalAuthority.getIsSales() == 1){//查询销售 提货数量
+            approvalInfo.setSelectType(1);
+            approvalInfo.setSelectState(1);
+            List<ApprovalInfo> listInfo = approvalOrderService.getApprovalInfo(approvalInfo);
+            rj.addResponseKeyValue("salesPickNum",listInfo.size());
+        }else{
+            rj.addResponseKeyValue("salesPickNum",0);
+        }
+        if(adminApprovalAuthority.getIsPmc() == 1 || adminApprovalAuthority.getIsManagement() == 1){
+            approvalInfo.setSelectType(2);
+            approvalInfo.setApprovalStatus(1);
+            List<ApprovalInfo> listInfo = approvalOrderService.getApprovalInfo(approvalInfo);
+            rj.addResponseKeyValue("approvalNum",listInfo.size());
+        }else{
+            rj.addResponseKeyValue("approvalNum",0);
+        }
+        if(adminApprovalAuthority.getIsManagement() == 1){
+            approvalInfo.setApprovalAdminId(null);
+            approvalInfo.setSelectState(3);
+            List<ApprovalInfo> listInfo = approvalOrderService.getApprovalInfo(approvalInfo);
+            rj.addResponseKeyValue("warehouseNum",listInfo.size());
+        }else{
+            rj.addResponseKeyValue("warehouseNum",0);
+        }
+        return rj;
+    }
 }