提交 85c40d17 authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com

1.员工物料工单

上级 4695ab99
......@@ -2666,6 +2666,43 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkTaskPeopleActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="新增"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkTaskChoosePeopleActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkTaskChooseCodeActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="搜索"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.work.WorkTaskMaterialsActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="新增"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
package com.wd.workoffice.bean.event;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class AddTaskEvent {
}
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* date: 2021-10-24
**/
public class ChangeStatus {
}
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* date: 2021-10-24
**/
public class FaultTypeBean {
private int pageNum;
private int pageSize;
private int size;
private int startRow;
private int endRow;
private int total;
private int pages;
private List<ListBean> list;
private int prePage;
private int nextPage;
private boolean isFirstPage;
private boolean isLastPage;
private boolean hasPreviousPage;
private boolean hasNextPage;
private int navigatePages;
private List<Integer> navigatepageNums;
private int navigateFirstPage;
private int navigateLastPage;
private int firstPage;
private int lastPage;
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getStartRow() {
return startRow;
}
public void setStartRow(int startRow) {
this.startRow = startRow;
}
public int getEndRow() {
return endRow;
}
public void setEndRow(int endRow) {
this.endRow = endRow;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public int getPrePage() {
return prePage;
}
public void setPrePage(int prePage) {
this.prePage = prePage;
}
public int getNextPage() {
return nextPage;
}
public void setNextPage(int nextPage) {
this.nextPage = nextPage;
}
public boolean isIsFirstPage() {
return isFirstPage;
}
public void setIsFirstPage(boolean isFirstPage) {
this.isFirstPage = isFirstPage;
}
public boolean isIsLastPage() {
return isLastPage;
}
public void setIsLastPage(boolean isLastPage) {
this.isLastPage = isLastPage;
}
public boolean isHasPreviousPage() {
return hasPreviousPage;
}
public void setHasPreviousPage(boolean hasPreviousPage) {
this.hasPreviousPage = hasPreviousPage;
}
public boolean isHasNextPage() {
return hasNextPage;
}
public void setHasNextPage(boolean hasNextPage) {
this.hasNextPage = hasNextPage;
}
public int getNavigatePages() {
return navigatePages;
}
public void setNavigatePages(int navigatePages) {
this.navigatePages = navigatePages;
}
public List<Integer> getNavigatepageNums() {
return navigatepageNums;
}
public void setNavigatepageNums(List<Integer> navigatepageNums) {
this.navigatepageNums = navigatepageNums;
}
public int getNavigateFirstPage() {
return navigateFirstPage;
}
public void setNavigateFirstPage(int navigateFirstPage) {
this.navigateFirstPage = navigateFirstPage;
}
public int getNavigateLastPage() {
return navigateLastPage;
}
public void setNavigateLastPage(int navigateLastPage) {
this.navigateLastPage = navigateLastPage;
}
public int getFirstPage() {
return firstPage;
}
public void setFirstPage(int firstPage) {
this.firstPage = firstPage;
}
public int getLastPage() {
return lastPage;
}
public void setLastPage(int lastPage) {
this.lastPage = lastPage;
}
public static class ListBean {
private String id;
private Object createDateTime;
private Object updateDateTime;
private String failureCode;
private Object failureChildId;
private Object failureChildCode;
private Object code;
private String description;
private Object childDescription;
private Object parentId;
private String orgId;
private Object createby;
private Object changeby;
private Object faultNumber;
private String orgName;
private Object createbyName;
private Object changebyName;
private Object childList;
private Object astFailurelistList;
private boolean delete;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public Object getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getFailureCode() {
return failureCode;
}
public void setFailureCode(String failureCode) {
this.failureCode = failureCode;
}
public Object getFailureChildId() {
return failureChildId;
}
public void setFailureChildId(Object failureChildId) {
this.failureChildId = failureChildId;
}
public Object getFailureChildCode() {
return failureChildCode;
}
public void setFailureChildCode(Object failureChildCode) {
this.failureChildCode = failureChildCode;
}
public Object getCode() {
return code;
}
public void setCode(Object code) {
this.code = code;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public Object getChildDescription() {
return childDescription;
}
public void setChildDescription(Object childDescription) {
this.childDescription = childDescription;
}
public Object getParentId() {
return parentId;
}
public void setParentId(Object parentId) {
this.parentId = parentId;
}
public String getOrgId() {
return orgId;
}
public void setOrgId(String orgId) {
this.orgId = orgId;
}
public Object getCreateby() {
return createby;
}
public void setCreateby(Object createby) {
this.createby = createby;
}
public Object getChangeby() {
return changeby;
}
public void setChangeby(Object changeby) {
this.changeby = changeby;
}
public Object getFaultNumber() {
return faultNumber;
}
public void setFaultNumber(Object faultNumber) {
this.faultNumber = faultNumber;
}
public String getOrgName() {
return orgName;
}
public void setOrgName(String orgName) {
this.orgName = orgName;
}
public Object getCreatebyName() {
return createbyName;
}
public void setCreatebyName(Object createbyName) {
this.createbyName = createbyName;
}
public Object getChangebyName() {
return changebyName;
}
public void setChangebyName(Object changebyName) {
this.changebyName = changebyName;
}
public Object getChildList() {
return childList;
}
public void setChildList(Object childList) {
this.childList = childList;
}
public Object getAstFailurelistList() {
return astFailurelistList;
}
public void setAstFailurelistList(Object astFailurelistList) {
this.astFailurelistList = astFailurelistList;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
}
}
......@@ -69,6 +69,7 @@ public class MesServiceCheckBillBean extends BaseMesPageBean {
private String billId;
private Object assetId;
private String locationId;
private String locationCode;
private String spotCheckProject;
private Object createby;
private Object changeby;
......@@ -79,6 +80,14 @@ public class MesServiceCheckBillBean extends BaseMesPageBean {
private String assetName;
private String locationName;
public String getLocationCode() {
return locationCode;
}
public void setLocationCode(String locationCode) {
this.locationCode = locationCode;
}
public String getId() {
return id;
}
......
......@@ -92,12 +92,12 @@ public class ServiceBean extends BaseMesPageBean {
private String description;
private Object remark;
private Object inspoType;
private int appType;
private Integer appType;
private String principal;
private String principalCode;
private String principalName;
private int status;
private int stopWork;
private Integer status;
private Integer stopWork;
private String planStartDateTime;
private String planEndDateTime;
private String actualStartDateTime;
......@@ -118,6 +118,7 @@ public class ServiceBean extends BaseMesPageBean {
private String adjustEndTime;
private String assetCode;
private String assetDesc;
private String assetId;
private String planCode;
private String planDesc;
private String locationCode;
......@@ -125,6 +126,14 @@ public class ServiceBean extends BaseMesPageBean {
private String locationId;
private String inspoTime;
public String getAssetId() {
return assetId;
}
public void setAssetId(String assetId) {
this.assetId = assetId;
}
public String getId() {
return id;
}
......@@ -173,11 +182,11 @@ public class ServiceBean extends BaseMesPageBean {
this.inspoType = inspoType;
}
public int getAppType() {
public Integer getAppType() {
return appType;
}
public void setAppType(int appType) {
public void setAppType(Integer appType) {
this.appType = appType;
}
......@@ -205,19 +214,19 @@ public class ServiceBean extends BaseMesPageBean {
this.principalName = principalName;
}
public int getStatus() {
public Integer getStatus() {
return status;
}
public void setStatus(int status) {
public void setStatus(Integer status) {
this.status = status;
}
public int getStopWork() {
public Integer getStopWork() {
return stopWork;
}
public void setStopWork(int stopWork) {
public void setStopWork(Integer stopWork) {
this.stopWork = stopWork;
}
......
......@@ -92,7 +92,7 @@ public class ServiceCheckBean extends BaseMesPageBean {
private String createby;
private String changeby;
private String delete;
private int status;
private Integer status;
private String siteId;
private String orgId;
private String astAssetCode;
......@@ -315,11 +315,11 @@ public class ServiceCheckBean extends BaseMesPageBean {
this.delete = delete;
}
public int getStatus() {
public Integer getStatus() {
return status;
}
public void setStatus(int status) {
public void setStatus(Integer status) {
this.status = status;
}
......
......@@ -83,9 +83,8 @@ public class ServiceStandardBean extends BaseMesPageBean {
private String numC;
private String measurementUnit;
private String description;
private int writeMethod;
private Integer writeMethod;
private String faultId;
private boolean delete;
private String createby;
private String changeby;
private String failureCode;
......@@ -93,6 +92,15 @@ public class ServiceStandardBean extends BaseMesPageBean {
private String inspoProDescription;
private String reportCode;
private String uint;
private String normal;
public String getNormal() {
return normal;
}
public void setNormal(String normal) {
this.normal = normal;
}
public String getInspoProDescription() {
return inspoProDescription;
......@@ -222,11 +230,11 @@ public class ServiceStandardBean extends BaseMesPageBean {
this.description = description;
}
public int getWriteMethod() {
public Integer getWriteMethod() {
return writeMethod;
}
public void setWriteMethod(int writeMethod) {
public void setWriteMethod(Integer writeMethod) {
this.writeMethod = writeMethod;
}
......@@ -238,13 +246,6 @@ public class ServiceStandardBean extends BaseMesPageBean {
this.faultId = faultId;
}
public boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
public String getCreateby() {
return createby;
......
......@@ -89,8 +89,8 @@ public class WokrOrderBean extends BaseMesPageBean {
private int status;
private String siteId;
private boolean shutDown;
private String shutdownTime;
private String recoveryTime;
private long shutdownTime;
private long recoveryTime;
private boolean grant;
private boolean materiel;
private String detailedInformation;
......@@ -120,6 +120,15 @@ public class WokrOrderBean extends BaseMesPageBean {
private String createName;
private String procId;
private String approved;
private Integer isSave;
public Integer getIsSave() {
return isSave;
}
public void setIsSave(Integer isSave) {
this.isSave = isSave;
}
public String getId() {
return id;
......@@ -241,19 +250,19 @@ public class WokrOrderBean extends BaseMesPageBean {
this.shutDown = shutDown;
}
public String getShutdownTime() {
public long getShutdownTime() {
return shutdownTime;
}
public void setShutdownTime(String shutdownTime) {
public void setShutdownTime(long shutdownTime) {
this.shutdownTime = shutdownTime;
}
public String getRecoveryTime() {
public long getRecoveryTime() {
return recoveryTime;
}
public void setRecoveryTime(String recoveryTime) {
public void setRecoveryTime(long recoveryTime) {
this.recoveryTime = recoveryTime;
}
......
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* date: 2021-10-24
**/
public class WorkFactoryBean {
private Object loginUserId;
private Object userId;
private Object userName;
private Object sex;
private Object email;
private Object mobile;
private Object name;
private Object siteId;
private Object siteName;
private Object siteCode;
private Object cardNo;
private Object status;
private Object joinDateTime;
private Object leaveDateTime;
private Object currentOrganization;
private Object functionVo;
private Object sysType;
private List<?> orgs;
private List<?> functions;
private List<SitesBean> sites;
private List<?> depts;
private Object roleIds;
private Object teamId;
public Object getLoginUserId() {
return loginUserId;
}
public void setLoginUserId(Object loginUserId) {
this.loginUserId = loginUserId;
}
public Object getUserId() {
return userId;
}
public void setUserId(Object userId) {
this.userId = userId;
}
public Object getUserName() {
return userName;
}
public void setUserName(Object userName) {
this.userName = userName;
}
public Object getSex() {
return sex;
}
public void setSex(Object sex) {
this.sex = sex;
}
public Object getEmail() {
return email;
}
public void setEmail(Object email) {
this.email = email;
}
public Object getMobile() {
return mobile;
}
public void setMobile(Object mobile) {
this.mobile = mobile;
}
public Object getName() {
return name;
}
public void setName(Object name) {
this.name = name;
}
public Object getSiteId() {
return siteId;
}
public void setSiteId(Object siteId) {
this.siteId = siteId;
}
public Object getSiteName() {
return siteName;
}
public void setSiteName(Object siteName) {
this.siteName = siteName;
}
public Object getSiteCode() {
return siteCode;
}
public void setSiteCode(Object siteCode) {
this.siteCode = siteCode;
}
public Object getCardNo() {
return cardNo;
}
public void setCardNo(Object cardNo) {
this.cardNo = cardNo;
}
public Object getStatus() {
return status;
}
public void setStatus(Object status) {
this.status = status;
}
public Object getJoinDateTime() {
return joinDateTime;
}
public void setJoinDateTime(Object joinDateTime) {
this.joinDateTime = joinDateTime;
}
public Object getLeaveDateTime() {
return leaveDateTime;
}
public void setLeaveDateTime(Object leaveDateTime) {
this.leaveDateTime = leaveDateTime;
}
public Object getCurrentOrganization() {
return currentOrganization;
}
public void setCurrentOrganization(Object currentOrganization) {
this.currentOrganization = currentOrganization;
}
public Object getFunctionVo() {
return functionVo;
}
public void setFunctionVo(Object functionVo) {
this.functionVo = functionVo;
}
public Object getSysType() {
return sysType;
}
public void setSysType(Object sysType) {
this.sysType = sysType;
}
public List<?> getOrgs() {
return orgs;
}
public void setOrgs(List<?> orgs) {
this.orgs = orgs;
}
public List<?> getFunctions() {
return functions;
}
public void setFunctions(List<?> functions) {
this.functions = functions;
}
public List<SitesBean> getSites() {
return sites;
}
public void setSites(List<SitesBean> sites) {
this.sites = sites;
}
public List<?> getDepts() {
return depts;
}
public void setDepts(List<?> depts) {
this.depts = depts;
}
public Object getRoleIds() {
return roleIds;
}
public void setRoleIds(Object roleIds) {
this.roleIds = roleIds;
}
public Object getTeamId() {
return teamId;
}
public void setTeamId(Object teamId) {
this.teamId = teamId;
}
public static class SitesBean {
private String id;
private String siteName;
private String siteCode;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSiteName() {
return siteName;
}
public void setSiteName(String siteName) {
this.siteName = siteName;
}
public String getSiteCode() {
return siteCode;
}
public void setSiteCode(String siteCode) {
this.siteCode = siteCode;
}
}
}
package com.wd.workoffice.bean.mesBean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
* date: 2021-10-26
**/
public class WorkPeopleBean {
private int pageNum;
private int pageSize;
private int size;
private int startRow;
private int endRow;
private int total;
private int pages;
private List<ListBean> list;
private int prePage;
private int nextPage;
private boolean isFirstPage;
private boolean isLastPage;
private boolean hasPreviousPage;
private boolean hasNextPage;
private int navigatePages;
private List<Integer> navigatepageNums;
private int navigateFirstPage;
private int navigateLastPage;
private int firstPage;
private int lastPage;
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public int getPageSize() {
return pageSize;
}
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getStartRow() {
return startRow;
}
public void setStartRow(int startRow) {
this.startRow = startRow;
}
public int getEndRow() {
return endRow;
}
public void setEndRow(int endRow) {
this.endRow = endRow;
}
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public int getPrePage() {
return prePage;
}
public void setPrePage(int prePage) {
this.prePage = prePage;
}
public int getNextPage() {
return nextPage;
}
public void setNextPage(int nextPage) {
this.nextPage = nextPage;
}
public boolean isIsFirstPage() {
return isFirstPage;
}
public void setIsFirstPage(boolean isFirstPage) {
this.isFirstPage = isFirstPage;
}
public boolean isIsLastPage() {
return isLastPage;
}
public void setIsLastPage(boolean isLastPage) {
this.isLastPage = isLastPage;
}
public boolean isHasPreviousPage() {
return hasPreviousPage;
}
public void setHasPreviousPage(boolean hasPreviousPage) {
this.hasPreviousPage = hasPreviousPage;
}
public boolean isHasNextPage() {
return hasNextPage;
}
public void setHasNextPage(boolean hasNextPage) {
this.hasNextPage = hasNextPage;
}
public int getNavigatePages() {
return navigatePages;
}
public void setNavigatePages(int navigatePages) {
this.navigatePages = navigatePages;
}
public List<Integer> getNavigatepageNums() {
return navigatepageNums;
}
public void setNavigatepageNums(List<Integer> navigatepageNums) {
this.navigatepageNums = navigatepageNums;
}
public int getNavigateFirstPage() {
return navigateFirstPage;
}
public void setNavigateFirstPage(int navigateFirstPage) {
this.navigateFirstPage = navigateFirstPage;
}
public int getNavigateLastPage() {
return navigateLastPage;
}
public void setNavigateLastPage(int navigateLastPage) {
this.navigateLastPage = navigateLastPage;
}
public int getFirstPage() {
return firstPage;
}
public void setFirstPage(int firstPage) {
this.firstPage = firstPage;
}
public int getLastPage() {
return lastPage;
}
public void setLastPage(int lastPage) {
this.lastPage = lastPage;
}
public static class ListBean {
private Object id;
private Object createDateTime;
private Object updateDateTime;
private String userId;
private String craftId;
private Object createBy;
private Object updateBy;
private String skillId;
private String userCode;
private String name;
private String skillCode;
private Object description;
private String level;
private String craftName;
private Object delete;
public Object getId() {
return id;
}
public void setId(Object id) {
this.id = id;
}
public Object getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getCraftId() {
return craftId;
}
public void setCraftId(String craftId) {
this.craftId = craftId;
}
public Object getCreateBy() {
return createBy;
}
public void setCreateBy(Object createBy) {
this.createBy = createBy;
}
public Object getUpdateBy() {
return updateBy;
}
public void setUpdateBy(Object updateBy) {
this.updateBy = updateBy;
}
public String getSkillId() {
return skillId;
}
public void setSkillId(String skillId) {
this.skillId = skillId;
}
public String getUserCode() {
return userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getSkillCode() {
return skillCode;
}
public void setSkillCode(String skillCode) {
this.skillCode = skillCode;
}
public Object getDescription() {
return description;
}
public void setDescription(Object description) {
this.description = description;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public String getCraftName() {
return craftName;
}
public void setCraftName(String craftName) {
this.craftName = craftName;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
}
}
......@@ -9,7 +9,8 @@ import android.text.TextUtils;
**/
public enum WorkOrder {
DRAFT("草稿", 1), PENDING("待审批", 2),
PROCESSING("处理中", 3), FINISH("已完成", 4), REFUSE("已驳回", 5);
PROCESSING("处理中", 3), FINISH("已完成", 4), CLOSE("已关闭", 5)
, REFUSE("已驳回", 6);
private String name;
private Integer code;
......
......@@ -3,6 +3,7 @@ package com.wd.workoffice.retrofit;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.ui.activity.mes.repair.MesFaultSearchActivity;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
......@@ -22,7 +23,7 @@ import retrofit2.http.Query;
**/
public interface MesApiService {
String DOMAIN = Config.DEBUG ? "http://192.168.3.33/" : "http://124.129.27.194:81/";
String DOMAIN = Config.DEBUG ? "http://10.10.11.129:8080" : "http://124.129.27.194:81/";
/**
......@@ -156,7 +157,6 @@ public interface MesApiService {
Observable<BaseMesBean> closeJob(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 产品
*
......@@ -515,7 +515,6 @@ public interface MesApiService {
Observable<BaseMesBean> markList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
......@@ -595,12 +594,31 @@ public interface MesApiService {
@POST("/himes/api/modinspo/show/list.json")
Observable<BaseMesBean> modinspoList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/show/listForApp.json")
Observable<BaseMesBean> modinspoListForApp(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@GET("/himes/api/modinspo/show/{id}.json")
Observable<BaseMesBean> modinspoDetail(@Path("id") String id, @Query("functionId") String functionId);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/show/pageForApp.json")
Observable<BaseMesBean> spotCheckBillListForApp(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/show/page.json")
Observable<BaseMesBean> spotCheckBillList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
......@@ -612,7 +630,8 @@ public interface MesApiService {
*/
@POST("/himes/api/modinspo/show/modinspoproject/modinspoprojectline/list.json")
Observable<BaseMesBean> serviceStandardList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
/**
* @return
*/
@POST("/himes/api/scrapAnalysis/show/list.json")
......@@ -679,7 +698,6 @@ public interface MesApiService {
Observable<BaseMesBean> historyList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
*
* @return
*/
@POST("/himes/api/astMeasurePoint/show/list.json")
......@@ -726,6 +744,7 @@ public interface MesApiService {
*/
@POST("/himes/api/quality/show/productBy/dispatchDetail.json")
Observable<BaseMesBean> dispatchDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 泥料
*
......@@ -742,6 +761,14 @@ public interface MesApiService {
@POST("/himes/api/opmreporterror/show/listWo.json")
Observable<BaseMesBean> opmreportError(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-工单-设备未消缺的隐患或故障
*
* @return
*/
@POST("/himes/api/workOrder/add/update.json")
Observable<BaseMesBean> workOrderUpdate(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-计划-子工单
*
......@@ -773,6 +800,7 @@ public interface MesApiService {
*/
@POST("/himes/api/workOrder/show/pagePlanMaterial.json")
Observable<BaseMesBean> pagePlanMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-计划-物料
*
......@@ -789,6 +817,7 @@ public interface MesApiService {
*/
@POST("/himes/api/workOrder/show/pageActivity.json")
Observable<BaseMesBean> pageActivity(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-计划-故障
*
......@@ -828,5 +857,174 @@ public interface MesApiService {
@POST("/himes/api/modinspo/show/modinspoproject/list.json")
Observable<BaseMesBean> modinspoproject(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/update/save.json")
Observable<BaseMesBean> modinspoprojectUpdate(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/show/spotCheckBillProject/page.json")
Observable<BaseMesBean> spotCheckBillProject(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/update/save.json")
Observable<BaseMesBean> spotCheckBillUpdate(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/spotCheckBill/add/spotCheckBillStandard/save.json")
Observable<BaseMesBean> spotCheckBillStandard(@Query("functionId") String functionId, @Query("option") int option, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/add/modinspoproject/modinspoprojectline/save.json")
Observable<BaseMesBean> modinspoproject(@Query("functionId") String functionId, @Query("option") int option, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/opmreporterror/add/save.json")
Observable<BaseMesBean> opmreporterror(@Query("functionId") String functionId, @Query("option") int option, @Body RequestBody requestBody);
/**
* @return
*/
@GET("/himes/api/opmreporterror/getNextCode")
Observable<BaseMesBean> getNextCode(@Query("functionId") String functionId);
/**
* @return
*/
@POST("/himes/api/astfailurelist/show/list.json")
Observable<BaseMesBean> astfailurelist(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/astfailurelist/show/line/list.json")
Observable<BaseMesBean> astfailureLinelist(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/site/show/removes/page.json")
Observable<BaseMesBean> removes(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/astlocations/show/list.json")
Observable<BaseMesBean> astlocations(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/astasset/show/page.json")
Observable<BaseMesBean> astasset(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/modinspo/show/list.json")
Observable<BaseMesBean> modinspo(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-工单-设备未消缺的隐患或故障
*
* @return
*/
@POST("/himes/api/opmreporterror/show/list.json")
Observable<BaseMesBean> opmreportErrorList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 质量工单-工单-设备未消缺的隐患或故障
*
* @return
*/
@POST("/himes/api/pjmproject/show/list.json")
Observable<BaseMesBean> pjmproject(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/saveActivity.json")
Observable<BaseMesBean> saveActivity(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/updateActivity.json")
Observable<BaseMesBean> updateActivity(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/deleteActivity/{id}.json")
Observable<BaseMesBean> deleteActivity(@Path("id") String id, @Query("functionId") String functionId);
/**
* @return
*/
@POST("/himes/api/userCraft/wordOrder/page.json")
Observable<BaseMesBean> userCraft(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/savePlanLabor.json")
Observable<BaseMesBean> savePlanLabor(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/updatePlanLabor.json")
Observable<BaseMesBean> updatePlanLabor(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/deletePlanLabor/{id}.json")
Observable<BaseMesBean> deletePlanLabor(@Path("id") String id, @Query("functionId") String functionId);
/**
* @return
*/
@POST("/himes/api/workOrder/deletePlanMaterial/{id}.json")
Observable<BaseMesBean> deletePlanMaterial(@Path("id") String id, @Query("functionId") String functionId);
/**
* @return
*/
@POST("/himes/api/materialBill/show/page.json")
Observable<BaseMesBean> materialBill(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/savePlanMaterial.json")
Observable<BaseMesBean> savePlanMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* @return
*/
@POST("/himes/api/workOrder/add/updatePlanMaterial.json")
Observable<BaseMesBean> updatePlanMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
}
......@@ -6,20 +6,30 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.event.ChangeStatus;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.bean.mesBean.WokrOrderBean;
import com.wd.workoffice.bean.mesBean.WorkOrderSon;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.bean.mesBean.WorkTaskMaterialsBean;
import com.wd.workoffice.bean.workEnum.WorkOrder;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.AddCrucibleCarActivity;
import com.wd.workoffice.ui.adapter.WorkOrderSonAdapter;
import com.wd.workoffice.ui.adapter.WorkOrderTaskAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -29,6 +39,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
......@@ -49,6 +60,8 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
RecyclerView rvSon;
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.tv_add_task)
TextView tvAddTask;
private Map<String, Object> param;
private List<WorkOrderSon.ListBean> sonList;
private List<WorkTaskBean.ListBean> taskList;
......@@ -108,7 +121,6 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
}
private void getData() {
RtfUtils.getMesRtf().workOrderChild("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
......@@ -149,6 +161,7 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
});
}
private void getTask() {
RtfUtils.getMesRtf().pageActivity("1", WorkUtils.convertMapToBody(taskParam)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
......@@ -180,7 +193,7 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
taskList.addAll(getList);
taskAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
if (getList.size() == 0 || getList.size() < Config.SIZE) {
taskAdapter.loadMoreEnd(true);
} else {
taskPage++;
......@@ -189,6 +202,7 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
});
}
@Override
protected void initEvent() {
sonAdapter.setOnLoadMoreListener(() -> {
......@@ -199,11 +213,37 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
taskParam.put("pageNum", taskPage);
getTask();
}, rvData);
taskAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_delete:
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(getActivity());
dialog.setMessage("此操作将永久删除该条信息, 是否继续?").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
delete(taskList.get(position).getId());
}
}).show();
break;
case R.id.tv_edit:
startActivity(WorkTaskActivity.class, "id", info.getId(),
"data", JSON.toJSONString(taskList.get(position)));
break;
}
}
});
taskAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkTaskDetailActivity.class,
"plan","1","info",JSON.toJSONString(taskList.get(position)));
"plan", "1", "info", JSON.toJSONString(taskList.get(position)));
}
});
}
......@@ -215,4 +255,55 @@ public class QualityWorkPlanFragment extends WorkBaseFg {
}
@OnClick(R.id.tv_add_task)
public void onClick() {
startActivity(WorkTaskActivity.class, "id", info.getId());
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddTaskEvent event) {
taskPage = 1;
taskParam.put("pageNum", 1);
getTask();
}
private void delete(String id) {
RtfUtils.getMesRtf().deleteActivity(id, "1"
).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
taskPage = 1;
taskParam.put("pageNum", 1);
getTask();
toast("删除成功");
}
});
}
}
package com.wd.workoffice.ui.activity.mes.work;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 新增工单任务
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkTaskActivity extends WorkToolBarActivity {
@BindView(R.id.tv_cancel)
TextView tvCancel;
@BindView(R.id.tv_save)
TextView tvSave;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_no)
TextView tvNo;
@BindView(R.id.tv_desc)
EditText tvDesc;
@BindView(R.id.tv_time)
EditText tvTime;
@BindView(R.id.tv_status)
TextView tvStatus;
private WorkTaskBean.ListBean data;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
String info = getIntent().getStringExtra("data");
if (!TextUtils.isEmpty(info)) {
data = JSON.parseObject(info, WorkTaskBean.ListBean.class);
tvTime.setText(data.getTime() + "");
tvDesc.setText(data.getDescription());
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_add_task;
}
@OnClick({R.id.tv_cancel, R.id.tv_save})
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_cancel:
finish();
break;
case R.id.tv_save:
String desc = tvDesc.getText().toString();
String time = tvTime.getText().toString();
if (TextUtils.isEmpty(desc)) {
toast("描述不能为空");
return;
}
if (TextUtils.isEmpty(time)) {
toast("估计持续时间(h)不能为空");
return;
}
Map<String, Object> param = WorkUtils.simpleParam();
param.put("status", "1");
param.put("description", desc);
param.put("time", time);
param.put("woId", getIntent().getStringExtra("id"));
Observable<BaseMesBean> baseMesBeanObservable;
if (data == null) {
baseMesBeanObservable = RtfUtils.getMesRtf().saveActivity("1",
WorkUtils.convertMapToBody(param));
} else {
param.put("id", data.getId());
baseMesBeanObservable = RtfUtils.getMesRtf().updateActivity("1",
WorkUtils.convertMapToBody(param));
}
baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
EventBus.getDefault().post(new AddTaskEvent());
finish();
toast("提交成功");
}
});
break;
}
}
}
package com.wd.workoffice.ui.activity.mes.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.WorkCodeBean;
import com.wd.workoffice.bean.mesBean.WorkPeopleBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.mes.repair.ServiceFaultActivity;
import com.wd.workoffice.ui.adapter.WorkCodeAdapter;
import com.wd.workoffice.ui.adapter.WorkPeopleAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 物料编码
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkTaskChooseCodeActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<WorkCodeBean.ListBean> clientList;
private WorkCodeAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new WorkCodeAdapter(R.layout.item_fault_search, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().materialBill("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<WorkCodeBean.ListBean> getList = JSON.parseObject(data.getData().toString(), WorkCodeBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_fault_search;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("materialName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
package com.wd.workoffice.ui.activity.mes.work;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.FaultTypeBean;
import com.wd.workoffice.bean.mesBean.WorkFactoryBean;
import com.wd.workoffice.bean.mesBean.WorkPeopleBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.FauliTypeAdapter;
import com.wd.workoffice.ui.adapter.WorkDepManageAdapter;
import com.wd.workoffice.ui.adapter.WorkFactoryAdapter;
import com.wd.workoffice.ui.adapter.WorkPeopleAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 员工搜索
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkTaskChoosePeopleActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<WorkPeopleBean.ListBean> clientList;
private WorkPeopleAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new WorkPeopleAdapter(R.layout.item_fault_search, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
paramMap.put("userId", getIntent().getStringExtra("id"));
param.put("paramMap", paramMap);
param.put("pageNum", 1);
getData();
}
private void getData() {
RtfUtils.getMesRtf().userCraft("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<WorkPeopleBean.ListBean> getList = JSON.parseObject(data.getData().toString(), WorkPeopleBean.class).getList();
if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
clientAdapter.loadMoreComplete();
} else {
clientAdapter.loadMoreComplete();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
clientAdapter.loadMoreEnd();
} else {
page++;
}
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("pageNum", page);
getData();
}
}, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("data", JSON.toJSONString(clientList.get(position)));
setResult(10001, intent);
finish();
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_mes_fault_search;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("name", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
}
......@@ -18,7 +18,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 质量工单详情
* 设备工单的任务详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
package com.wd.workoffice.ui.activity.mes.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.TaskMaterials;
import com.wd.workoffice.bean.mesBean.WorkCodeBean;
import com.wd.workoffice.bean.mesBean.WorkPeopleBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 新增任务下的物料
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkTaskMaterialsActivity extends WorkToolBarActivity {
@BindView(R.id.tv_cancel)
TextView tvCancel;
@BindView(R.id.tv_save)
TextView tvSave;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.ll_code)
LinearLayout llCode;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_num)
EditText tvNum;
@BindView(R.id.tv_level)
TextView tvLevel;
@BindView(R.id.tv_send)
TextView tvSend;
private TaskMaterials.ListBean data;
private WorkCodeBean.ListBean choosePeople;
private WorkTaskBean.ListBean info;
private String[] statusList = new String[]{"是", "否"};
private Integer[] statusValue = new Integer[]{1, 0};
private QMUIDialog.MenuDialogBuilder statusDialog;
private int chooseStatus = 1;
@Override
protected void initView() {
ButterKnife.bind(this);
statusDialog = DialogUtils.listDialog(this);
statusDialog.addItems(statusList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
tvSend.setText(statusList[which]);
chooseStatus = statusValue[which];
}
});
tvSend.setText(statusList[0]);
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"),
WorkTaskBean.ListBean.class);
String dataStr = getIntent().getStringExtra("data");
if (!TextUtils.isEmpty(dataStr)) {
data = JSON.parseObject(dataStr, TaskMaterials.ListBean.class);
choosePeople = new WorkCodeBean.ListBean();
choosePeople.setMaterialCode(data.getItemCode());
choosePeople.setMaterialName(data.getItemName());
choosePeople.setStorageCode(data.getLocationName());
if (data.isDirectReq()) {
chooseStatus = 1;
tvSend.setText(statusList[0]);
} else {
chooseStatus = 0;
tvSend.setText(statusList[1]);
}
tvNum.setText(MathUtils.converData(data.getItemQty(), 3));
tvName.setText(choosePeople.getMaterialName());
tvLevel.setText(choosePeople.getStorageDesc());
tvCode.setText(choosePeople.getMaterialCode());
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_add_materials;
}
@OnClick({R.id.ll_send,R.id.tv_cancel, R.id.tv_save, R.id.ll_code})
public void onClick(View view) {
switch (view.getId()) {
case R.id.ll_send:
statusDialog.show();
break;
case R.id.tv_cancel:
finish();
break;
case R.id.tv_save:
if (null == choosePeople) {
toast("请选择物料编码");
return;
}
if (TextUtils.isEmpty(tvNum.getText().toString())) {
toast("请填写数量");
return;
}
Map<String, Object> param = WorkUtils.simpleParam();
param.put("actId", info.getId());
param.put("actDesc", info.getDescription());
param.put("actNum", info.getActNum());
param.put("woId", info.getWoId());
param.put("itemCode", choosePeople.getMaterialCode());
param.put("itemName", choosePeople.getMaterialName());
param.put("itemQty", tvNum.getText().toString());
param.put("directReq", chooseStatus == 1);
Observable<BaseMesBean> baseMesBeanObservable;
if (data == null) {
baseMesBeanObservable = RtfUtils.getMesRtf().savePlanMaterial("aa8faf47c93311e98334fa163e1166bd",
WorkUtils.convertMapToBody(param));
} else {
param.put("id", data.getId());
baseMesBeanObservable = RtfUtils.getMesRtf().updatePlanMaterial("1",
WorkUtils.convertMapToBody(param));
}
baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
EventBus.getDefault().post(new AddTaskEvent());
finish();
toast("提交成功");
}
});
break;
case R.id.ll_code:
startActivityForResult(WorkTaskChooseCodeActivity.class, 10001
, "id", info.getWoId());
break;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
choosePeople = JSON.parseObject(data.getStringExtra("data"), WorkCodeBean.ListBean.class);
tvName.setText(choosePeople.getMaterialName());
tvLevel.setText(choosePeople.getStorageDesc());
tvCode.setText(choosePeople.getMaterialCode());
}
}
}
......@@ -2,12 +2,19 @@ package com.wd.workoffice.ui.activity.mes.work;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.TaskMaterials;
import com.wd.workoffice.bean.mesBean.TaskPeopleBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
......@@ -15,8 +22,12 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkTaskMaterialsAdapter;
import com.wd.workoffice.ui.adapter.WorkTaskPeopleAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -26,6 +37,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
......@@ -39,15 +51,12 @@ import io.reactivex.disposables.Disposable;
public class WorkTaskMaterialsFragment extends WorkBaseFg {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private Map<String, Object> param;
@BindView(R.id.tv_add)
TextView tvAdd;
private List<TaskMaterials.ListBean> taskList;
private WorkTaskMaterialsAdapter taskAdapter;
private WorkTaskBean.ListBean info;
private int page = 1;
private int taskPage = 1;
private Map<String, Object> paramMap;
private Map<String, Object> taskParam;
private Map<String, Object> taskParamMap;
private String plan;
......@@ -122,7 +131,7 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
taskList.addAll(getList);
taskAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
if (getList.size() == 0||getList.size()< Config.SIZE) {
taskAdapter.loadMoreEnd(true);
} else {
taskPage++;
......@@ -138,13 +147,89 @@ public class WorkTaskMaterialsFragment extends WorkBaseFg {
taskParam.put("pageNum", taskPage);
getTask();
}, rvData);
taskAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_delete:
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(getActivity());
dialog.setMessage("此操作将永久删除该条信息, 是否继续?").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
delete(taskList.get(position).getId());
}
}).show();
break;
case R.id.tv_edit:
startActivity(WorkTaskMaterialsActivity.class, "id", info.getId(),
"data", JSON.toJSONString(taskList.get(position))
, "info", JSON.toJSONString(info));
break;
}
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_pro_price;
return R.layout.activity_work_people;
}
@OnClick(R.id.tv_add)
public void onClick() {
startActivity(WorkTaskMaterialsActivity.class, "info", JSON.toJSONString(info));
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddTaskEvent event) {
taskPage = 1;
taskParam.put("pageNum", 1);
getTask();
}
private void delete(String id) {
RtfUtils.getMesRtf().deletePlanMaterial(id, "aa8faf47c93311e98334fa163e1166bd"
).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
taskPage = 1;
taskParam.put("pageNum", 1);
getTask();
toast("删除成功");
}
});
}
}
package com.wd.workoffice.ui.activity.mes.work;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTaskEvent;
import com.wd.workoffice.bean.mesBean.WorkPeopleBean;
import com.wd.workoffice.bean.mesBean.WorkTaskBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 新增任务下的员工
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkTaskPeopleActivity extends WorkToolBarActivity {
@BindView(R.id.tv_cancel)
TextView tvCancel;
@BindView(R.id.tv_save)
TextView tvSave;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.tv_no)
TextView tvNo;
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.ll_code)
LinearLayout llCode;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_type)
TextView tvType;
@BindView(R.id.tv_level)
TextView tvLevel;
private WorkTaskBean.ListBean data;
private WorkPeopleBean.ListBean choosePeople;
private WorkTaskBean.ListBean info;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"),
WorkTaskBean.ListBean.class);
tvNo.setText(info.getActNum());
String dataStr = getIntent().getStringExtra("data");
if (!TextUtils.isEmpty(dataStr)) {
data = JSON.parseObject(dataStr, WorkTaskBean.ListBean.class);
choosePeople =new WorkPeopleBean.ListBean();
choosePeople.setCraftId(data.getCraftId());
choosePeople.setCraftName(data.getCraftName());
choosePeople.setSkillId(data.getCraftName());
choosePeople.setSkillCode(data.getCraftName());
choosePeople.setUserCode(data.getUserCode());
choosePeople.setUserId(data.getUserId());
choosePeople.setName(data.getUserName());
tvName.setText(choosePeople.getName());
tvLevel.setText(choosePeople.getLevel());
tvCode.setText(choosePeople.getUserCode());
tvType.setText(choosePeople.getCraftName());
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_add_people;
}
@OnClick({R.id.tv_cancel, R.id.tv_save, R.id.ll_code})
public void onClick(View view) {
switch (view.getId()) {
case R.id.tv_cancel:
finish();
break;
case R.id.tv_save:
if (null == choosePeople) {
toast("请选择员工");
return;
}
Map<String, Object> param = WorkUtils.simpleParam();
param.put("actId", info.getId());
param.put("actDesc", info.getDescription());
param.put("actNum", info.getActNum());
param.put("craftId", choosePeople.getCraftId());
param.put("craftName", choosePeople.getCraftName());
param.put("skillId", choosePeople.getSkillId());
param.put("skillName", choosePeople.getSkillCode());
param.put("userCode", choosePeople.getUserCode());
param.put("userId", choosePeople.getUserId());
param.put("userName", choosePeople.getName());
param.put("woId", info.getWoId());
param.put("delete", false);
Observable<BaseMesBean> baseMesBeanObservable;
if (data == null) {
baseMesBeanObservable = RtfUtils.getMesRtf().savePlanLabor("aa8faf47c93311e98334fa163e1166bd",
WorkUtils.convertMapToBody(param));
} else {
param.put("id", data.getId());
baseMesBeanObservable = RtfUtils.getMesRtf().updatePlanLabor("1",
WorkUtils.convertMapToBody(param));
}
baseMesBeanObservable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
EventBus.getDefault().post(new AddTaskEvent());
finish();
toast("提交成功");
}
});
break;
case R.id.ll_code:
startActivityForResult(WorkTaskChoosePeopleActivity.class, 10001
,"id",info.getWoId());
break;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
choosePeople = JSON.parseObject(data.getStringExtra("data"), WorkPeopleBean.ListBean.class);
tvName.setText(choosePeople.getName());
tvLevel.setText(choosePeople.getLevel());
tvCode.setText(choosePeople.getUserCode());
tvType.setText(choosePeople.getCraftName());
}
}
}
......@@ -40,8 +40,8 @@ public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardB
helper.setText(R.id.tv_content3, item.getFailureCode());
} else {
helper.setText(R.id.tv_name, String.format("检查项目:%s", item.getInspoProDescription()));
if (!TextUtils.isEmpty(item.getStatus())) {
helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "异常" : "正常");//1 异常 0正
if (!TextUtils.isEmpty(item.getNormal())) {
helper.setText(R.id.tv_status, TextUtils.equals(item.getNormal(), "0") ? "异常" : "正常");//1正常 0异
}
helper.setText(R.id.tv_content1, item.getProcessStandard());
helper.setText(R.id.tv_content2, item.getUint());
......
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.mesBean.WorkCodeBean;
import com.wd.workoffice.bean.mesBean.WorkPeopleBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkCodeAdapter extends BaseQuickAdapter<WorkCodeBean.ListBean, BaseViewHolder> {
public WorkCodeAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, WorkCodeBean.ListBean item) {
helper.setText(R.id.tv_content1, item.getMaterialCode());
helper.setText(R.id.tv_content2, item.getMaterialName());
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论