diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java index ecb105d..a658338 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java @@ -2,5 +2,9 @@ package com.deer.wms.produce.manage.dao; import com.deer.wms.produce.manage.model.MtAloneByCoatingGlue; import com.deer.wms.project.seed.core.mapper.Mapper; + +import java.util.List; + public interface MtAloneByCoatingGlueMapper extends Mapper { + List getAllByCompany(Integer companyId); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java index c7c0664..8c89c13 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java @@ -1,6 +1,8 @@ package com.deer.wms.produce.manage.dao; import com.deer.wms.produce.manage.model.MtAloneByProductInfo; +import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams; +import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo; import com.deer.wms.project.seed.core.mapper.Mapper; import java.util.List; @@ -9,4 +11,6 @@ public interface MtAloneByProductInfoMapper extends Mapper void deleteByOrderInfoId(Integer id); List findByOrderInfoId(Integer id); + + MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java index 6b8f101..fbfb2b6 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java @@ -1,6 +1,11 @@ package com.deer.wms.produce.manage.dao; import com.deer.wms.produce.manage.model.MtAloneByWeavCloth; +import com.deer.wms.produce.manage.model.MtAloneByWeavClothParams; import com.deer.wms.project.seed.core.mapper.Mapper; + +import java.util.List; + public interface MtAloneByWeavClothMapper extends Mapper { + List greyCloth(MtAloneByWeavClothParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java index d932578..4af7d4a 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java @@ -17,5 +17,7 @@ public interface MtAloneProcessMapper extends Mapper { List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); + List getSupplier(MtAloneProcessParams mtAloneProcessParams); + //List processStepListByProdprocid(ProductProcessParams params); } \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml index 84cde06..5d5f4dd 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml @@ -15,7 +15,7 @@ - SELECT * FROM mt_alone_by_a_shelf WHERE a_shelf_status = #{aShelfStatus} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml index 4fbd856..2f5832a 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml @@ -16,4 +16,10 @@ + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml index cbccf27..d976886 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml @@ -35,6 +35,11 @@ + + + + + delete FROM mt_alone_by_product_info WHERE order_info_id = #{id} @@ -46,4 +51,11 @@ WHERE order_info_id = #{id} AND product_status = 0 + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml index ed80d7f..4cf5933 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml @@ -28,4 +28,12 @@ + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml index 6a3da3b..8b927cf 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml @@ -172,4 +172,10 @@ ORDER BY process.process_step ASC + + \ No newline at end of file diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java index b9d41dc..e916f5e 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java @@ -25,6 +25,12 @@ public class MtAloneByCoatingGlue { @Column(name = "gule_status") private Integer guleStatus; + /** + * 绑定公司id + */ + @Column(name = "company_id") + private Integer companyId; + /** * 胶水类型,数字字典code,内容:打底胶水,面涂胶水,其它胶水 */ @@ -117,6 +123,14 @@ public class MtAloneByCoatingGlue { return guleStatus; } + public Integer getCompanyId() { + return companyId; + } + + public void setCompanyId(Integer companyId) { + this.companyId = companyId; + } + /** * 设置状态 0处理中,1处理完成,2逻辑删除 * diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java index 9d631a1..e0f2a77 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java @@ -112,6 +112,11 @@ public class MtAloneByProductInfo { */ private String note; + /** + * 发起流程 + */ + private String initiationProcess; + /** * 现货 是否 全部ok 1 true,2 false */ @@ -501,6 +506,14 @@ public class MtAloneByProductInfo { this.note = note; } + public String getInitiationProcess() { + return initiationProcess; + } + + public void setInitiationProcess(String initiationProcess) { + this.initiationProcess = initiationProcess; + } + /** * 获取现货 是否 全部ok 1 true,2 false * diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java index 4654dae..3a883d9 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java @@ -6,4 +6,13 @@ import com.deer.wms.project.seed.core.service.QueryParams; * Created by on 2020/08/18. */ public class MtAloneByProductInfoParams extends QueryParams { + private Integer id; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoVo.java new file mode 100644 index 0000000..aac723c --- /dev/null +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoVo.java @@ -0,0 +1,28 @@ +package com.deer.wms.produce.manage.model; + +/** + * @Author weihongyang + * @Date 2020/8/24 9:40 + * @Version 1.0 + */ +public class MtAloneByProductInfoVo extends MtAloneByProductInfo{ + private String orderCode; + + private String clientCode; + + public String getOrderCode() { + return orderCode; + } + + public void setOrderCode(String orderCode) { + this.orderCode = orderCode; + } + + public String getClientCode() { + return clientCode; + } + + public void setClientCode(String clientCode) { + this.clientCode = clientCode; + } +} diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java index a62a91c..a25586b 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java @@ -6,4 +6,23 @@ import com.deer.wms.project.seed.core.service.QueryParams; * Created by on 2020/08/18. */ public class MtAloneByWeavClothParams extends QueryParams { + private Integer isStock; + + private Integer productId; + + public Integer getIsStock() { + return isStock; + } + + public void setIsStock(Integer isStock) { + this.isStock = isStock; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java index fe4787d..871f056 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java @@ -12,5 +12,5 @@ import java.util.List; public interface MtAloneByCoatingGlueService extends Service { - + List getAllByCompany(Integer companyId); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java index 90ee021..177f8dc 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java @@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service; import com.deer.wms.produce.manage.model.MtAloneByProductInfo; import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams; +import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo; import com.deer.wms.project.seed.core.service.Service; import java.util.List; @@ -15,4 +16,6 @@ public interface MtAloneByProductInfoService extends Service findByOrderInfoId(Integer id); + + MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java index e1a0047..5fcfb15 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java @@ -12,5 +12,5 @@ import java.util.List; public interface MtAloneByWeavClothService extends Service { - + List greyCloth(MtAloneByWeavClothParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java index 506f720..7f0ffab 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java @@ -24,5 +24,7 @@ public interface MtAloneProcessService extends Service List findDetectProcessByBatchDet(ProductProcessBatchDetParams params); + List getSupplier(MtAloneProcessParams mtAloneProcessParams); + //List processStepListByProdprocid(ProductProcessParams params); } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java index 9725a8a..ce51957 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java @@ -22,5 +22,8 @@ public class MtAloneByCoatingGlueServiceImpl extends AbstractService getAllByCompany(Integer companyId) { + return mtAloneByCoatingGlueMapper.getAllByCompany(companyId); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java index ae507c3..11135de 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service.impl; import com.deer.wms.produce.manage.dao.MtAloneByProductInfoMapper; import com.deer.wms.produce.manage.model.MtAloneByProductInfo; import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams; +import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo; import com.deer.wms.produce.manage.service.MtAloneByProductInfoService; import com.deer.wms.project.seed.core.service.AbstractService; @@ -31,4 +32,9 @@ public class MtAloneByProductInfoServiceImpl extends AbstractService findByOrderInfoId(Integer id) { return mtAloneByProductInfoMapper.findByOrderInfoId(id); } + + @Override + public MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params) { + return mtAloneByProductInfoMapper.initiationProcess(params); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java index 1c562fd..3ff3e82 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java @@ -22,4 +22,8 @@ public class MtAloneByWeavClothServiceImpl extends AbstractService greyCloth(MtAloneByWeavClothParams params) { + return mtAloneByWeavClothMapper.greyCloth(params); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java index b00a0d3..a6167be 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java @@ -122,6 +122,11 @@ public class MtAloneProcessServiceImpl extends AbstractService getSupplier(MtAloneProcessParams mtAloneProcessParams) { + return mtAloneProcessMapper.getSupplier(mtAloneProcessParams); + } + //@Override //public List processStepListByProdprocid(ProductProcessParams params) { // return mtAloneProcessMapper.processStepListByProdprocid(params); diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java index 49fda64..b75324f 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java @@ -30,7 +30,7 @@ import java.util.List; /** * Created by on 2020/08/18. */ -@Api(description = "xxx接口") +@Api(description = "胶水接口") @RestController @RequestMapping("/mt/alone/by/coating/glues") public class MtAloneByCoatingGlueController { @@ -90,4 +90,15 @@ public class MtAloneByCoatingGlueController { return ResultGenerator.genSuccessResult(pageInfo); } + /** + * 查询全部胶水 条件公司id + */ + @GetMapping("/get/all/by/company") + public Result getAllByCompany(@ApiIgnore @User CurrentUser currentUser) { + if (currentUser == null) { + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR, "未登录错误", null); + } + List list = mtAloneByCoatingGlueService.getAllByCompany(currentUser.getCompanyId()); + return ResultGenerator.genSuccessResult(list); + } } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java index 0dacb12..590f3e8 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java @@ -203,4 +203,5 @@ public class MtAloneByOrderInfoController { List list = userInfoService.findUserFormList(userInfoCriteria); return ResultGenerator.genSuccessResult(list); } + } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java index 2242619..12d65ca 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java @@ -5,6 +5,7 @@ import com.deer.wms.base.system.model.MtAloneProductLibraryParams; import com.deer.wms.base.system.service.MtAloneProductLibraryService; import com.deer.wms.base.system.web.MtAloneProductLibraryController; import com.deer.wms.produce.manage.model.MtAloneByAShelf; +import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo; import com.deer.wms.project.seed.annotation.OperateLog; import com.deer.wms.project.seed.constant.SystemManageConstant; import com.deer.wms.project.seed.core.result.CommonCode; @@ -113,4 +114,16 @@ public class MtAloneByProductInfoController { return ResultGenerator.genSuccessResult(list); } + /** + * 发起流程 + */ + @PostMapping("initiation/process") + public Result initiationProcess(MtAloneByProductInfoParams params,@ApiIgnore @User CurrentUser currentUser){ + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + MtAloneByProductInfoVo mtAloneByProductInfoVo = mtAloneByProductInfoService.initiationProcess(params); + return ResultGenerator.genSuccessResult(mtAloneByProductInfoVo); + } + } diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java index 152de82..b37114f 100644 --- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java +++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java @@ -1,13 +1,12 @@ package com.deer.wms.produce.manage.web; -import com.deer.wms.produce.manage.model.MtAloneByAShelf; +import com.deer.wms.produce.manage.model.*; +import com.deer.wms.produce.manage.service.MtAloneProcessService; import com.deer.wms.project.seed.annotation.OperateLog; import com.deer.wms.project.seed.constant.SystemManageConstant; import com.deer.wms.project.seed.core.result.CommonCode; import com.deer.wms.project.seed.core.result.Result; import com.deer.wms.project.seed.core.result.ResultGenerator; -import com.deer.wms.produce.manage.model.MtAloneByWeavCloth; -import com.deer.wms.produce.manage.model.MtAloneByWeavClothParams; import com.deer.wms.produce.manage.service.MtAloneByWeavClothService; import com.deer.wms.intercept.annotation.User; import com.deer.wms.intercept.common.data.CurrentUser; @@ -30,7 +29,7 @@ import java.util.List; /** * Created by on 2020/08/18. */ -@Api(description = "xxx接口") +@Api(description = "织布接口") @RestController @RequestMapping("/mt/alone/by/weav/cloths") public class MtAloneByWeavClothController { @@ -38,15 +37,18 @@ public class MtAloneByWeavClothController { @Autowired private MtAloneByWeavClothService mtAloneByWeavClothService; - @OperateLog(description = "添加xxx", type = "增加") - @ApiOperation(value = "添加xxx", notes = "添加xxx") + @Autowired + private MtAloneProcessService mtAloneProcessService; + + @OperateLog(description = "添加坯布", type = "增加") + @ApiOperation(value = "添加坯布", notes = "添加坯布") @PostMapping("/add") public Result add(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth, @ApiIgnore @User CurrentUser currentUser) { if(currentUser==null){ return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null ); } - mtAloneByWeavCloth.setCreateTime(new Date()); - mtAloneByWeavCloth.setCompanyId(currentUser.getCompanyId()); + mtAloneByWeavCloth.setCreateTime(new Date()); + mtAloneByWeavCloth.setCompanyId(currentUser.getCompanyId()); mtAloneByWeavClothService.save(mtAloneByWeavCloth); return ResultGenerator.genSuccessResult(); } @@ -59,8 +61,8 @@ public class MtAloneByWeavClothController { return ResultGenerator.genSuccessResult(); } - @OperateLog(description = "修改xxx", type = "更新") - @ApiOperation(value = "修改xxx", notes = "修改xxx") + @OperateLog(description = "修改坯布", type = "更新") + @ApiOperation(value = "修改坯布", notes = "修改坯布") @PostMapping("/update") public Result update(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth) { mtAloneByWeavCloth.setUpdateTime(new Date()); @@ -92,4 +94,31 @@ public class MtAloneByWeavClothController { return ResultGenerator.genSuccessResult(pageInfo); } + /** + * 坯布情况 + */ + @GetMapping("/grey/cloth") + public Result greyCloth(MtAloneByWeavClothParams params, @ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + params.setCompanyId(currentUser.getCompanyId()); + List list = mtAloneByWeavClothService.greyCloth(params); + return ResultGenerator.genSuccessResult(list); + } + + /** + * 获取供应商 + */ + @GetMapping("/get/supplier") + public Result getSupplier(@ApiIgnore @User CurrentUser currentUser) { + if(currentUser==null){ + return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null ); + } + MtAloneProcessParams mtAloneProcessParams = new MtAloneProcessParams(); + mtAloneProcessParams.setCompanyId(currentUser.getCompanyId()); + List mtAloneProcessList = mtAloneProcessService.getSupplier(mtAloneProcessParams); + return ResultGenerator.genSuccessResult(mtAloneProcessList); + } + }