wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

生产订单

Browse Source
This commit is contained in:
weihongyang
2020-08-21 17:01:29 +08:00
parent 0eec7c0f85
commit 6b838944ba
19 changed files with 350 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wms-produce-manage/pom.xml
View File

@@ -33,6 +33,16 @@
<version>${project.version}</version>
<!--<scope>compile</scope>-->
</dependency>
<dependency>
<groupId>com.deer</groupId>
<artifactId>wms-system-manage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.deer</groupId>
<artifactId>wms-base-system</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>

5
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java
View File

@@ -42,4 +42,9 @@ public class ProduceManagePublicMethod {
String code = creatBatchDetCode(new Date(), 10, "1", "1");
System.out.println("----------"+code);
}
public static String getUUID(){
String uuid = UUID.randomUUID().toString().replace("-", "");
return uuid;
}
}

7
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java
View File

@@ -1,6 +1,13 @@
package com.deer.wms.produce.manage.dao;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
import com.deer.wms.project.seed.core.mapper.Mapper;
import java.util.List;
public interface MtAloneByOrderInfoMapper extends Mapper<MtAloneByOrderInfo> {
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
}

6
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java
View File

@@ -2,5 +2,11 @@ package com.deer.wms.produce.manage.dao;
import com.deer.wms.produce.manage.model.MtAloneByProductInfo;
import com.deer.wms.project.seed.core.mapper.Mapper;
import java.util.List;
public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo> {
void deleteByOrderInfoId(Integer id);
List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
}

23
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml
View File

@@ -28,4 +28,27 @@
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="note" jdbcType="VARCHAR" property="note" />
</resultMap>
<select id="findList" resultMap="BaseResultMap">
SELECT id,operator_id,create_time,update_time,creator_id,updater_id,order_status,order_name,order_code,follow_id,follow_name,
schedule,carry_out_time,client_id,client_code,client_name,client_tel,ship_time,description,note
FROM mt_alone_by_order_info
<where>
<if test="keywords != null and keywords != ''">
order_code LIKE CONCAT('%', #{keywords}, '%')
OR client_code LIKE CONCAT('%', #{keywords}, '%')
OR order_name LIKE CONCAT('%', #{keywords}, '%')
</if>
<if test="beginTime!=null and beginTime!=''">
<![CDATA[ AND DATE_FORMAT(create_time, '%Y-%m-%d')>= DATE_FORMAT(#{beginTime}, '%Y-%m-%d') ]]>
</if>
<if test="endTime!=null and endTime!=''">
<![CDATA[ AND DATE_FORMAT(create_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
</if>
<if test="companyId != null">
AND mappb.company_id = #{companyId}
</if>
</where>
</select>
</mapper>

11
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml
View File

@@ -34,4 +34,15 @@
<result column="deliver_goods" jdbcType="INTEGER" property="deliverGoods" />
<result column="complete" jdbcType="INTEGER" property="complete" />
</resultMap>
<delete id="deleteByOrderInfoId" parameterType="Integer">
delete FROM mt_alone_by_product_info
WHERE order_info_id = #{id}
</delete>
<select id="findByOrderInfoId" parameterType="Integer" resultMap="BaseResultMap">
SELECT *
FROM mt_alone_by_product_info
WHERE order_info_id = #{id}
</select>
</mapper>

16
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapstruct/MtAloneByOrderInfoMapping.java Normal file
View File

@@ -0,0 +1,16 @@
package com.deer.wms.produce.manage.mapstruct;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
import org.mapstruct.Mapper;
/**
* @Author weihongyang
* @Date 2020/8/21 16:24
* @Version 1.0
*/
@Mapper
public interface MtAloneByOrderInfoMapping {
MtAloneByOrderInfoVo MtAloneByOrderInfoToMtAloneByOrderInfoVo(MtAloneByOrderInfo mtAloneByOrderInfo);
}

9
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfo.java
View File

@@ -1,5 +1,7 @@
package com.deer.wms.produce.manage.model;
import org.apache.commons.lang3.builder.ToStringBuilder;
import java.util.Date;
import javax.persistence.*;
@@ -521,4 +523,11 @@ public class MtAloneByOrderInfo {
public void setNote(String note) {
this.note = note;
}
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this);
}
}

20
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java
View File

@@ -6,4 +6,24 @@ import com.deer.wms.project.seed.core.service.QueryParams;
* Created by on 2020/08/18.
*/
public class MtAloneByOrderInfoParams extends QueryParams {
private String beginTime;
private String endTime;
public String getBeginTime() {
return beginTime;
}
public void setBeginTime(String beginTime) {
this.beginTime = beginTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}

21
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoVo.java Normal file
View File

@@ -0,0 +1,21 @@
package com.deer.wms.produce.manage.model;
import java.util.Date;
import java.util.List;
/**
* @Author weihongyang
* @Date 2020/8/21 15:09
* @Version 1.0
*/
public class MtAloneByOrderInfoVo extends MtAloneByOrderInfo{
private List<MtAloneByProductInfo> mtAloneByProductInfos;
public List<MtAloneByProductInfo> getMtAloneByProductInfos() {
return mtAloneByProductInfos;
}
public void setMtAloneByProductInfos(List<MtAloneByProductInfo> mtAloneByProductInfos) {
this.mtAloneByProductInfos = mtAloneByProductInfos;
}
}

3
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java
View File

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
import com.deer.wms.project.seed.core.service.Service;
import java.util.List;
@@ -12,5 +13,5 @@ import java.util.List;
public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, Integer> {
List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
}

2
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java
View File

@@ -12,5 +12,7 @@ import java.util.List;
public interface MtAloneByProductInfoService extends Service<MtAloneByProductInfo, Integer> {
void deleteByOrderInfoId(Integer id);
List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
}

5
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service.impl;
import com.deer.wms.produce.manage.dao.MtAloneByOrderInfoMapper;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
import com.deer.wms.project.seed.core.service.AbstractService;
@@ -22,5 +23,9 @@ public class MtAloneByOrderInfoServiceImpl extends AbstractService<MtAloneByOrde
private MtAloneByOrderInfoMapper mtAloneByOrderInfoMapper;
@Override
public List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params) {
return mtAloneByOrderInfoMapper.findList(params);
}
}

8
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java
View File

@@ -22,5 +22,13 @@ public class MtAloneByProductInfoServiceImpl extends AbstractService<MtAloneByPr
private MtAloneByProductInfoMapper mtAloneByProductInfoMapper;
@Override
public void deleteByOrderInfoId(Integer id) {
mtAloneByProductInfoMapper.deleteByOrderInfoId(id);
}
@Override
public List<MtAloneByProductInfo> findByOrderInfoId(Integer id) {
return mtAloneByProductInfoMapper.findByOrderInfoId(id);
}
}

106
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java
View File

@@ -1,16 +1,25 @@
package com.deer.wms.produce.manage.web;
import com.deer.wms.produce.manage.model.MtAloneByAShelf;
import com.deer.wms.base.system.model.ClientManage;
import com.deer.wms.base.system.model.ClientManageCriteria;
import com.deer.wms.base.system.service.ClientManageService;
import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod;
import com.deer.wms.produce.manage.mapstruct.MtAloneByOrderInfoMapping;
import com.deer.wms.produce.manage.model.*;
import com.deer.wms.produce.manage.service.MtAloneByProductInfoService;
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.MtAloneByOrderInfo;
import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
import com.deer.wms.intercept.annotation.User;
import com.deer.wms.intercept.common.data.CurrentUser;
import com.deer.wms.system.manage.model.user.UserInfo;
import com.deer.wms.system.manage.model.user.UserInfoCriteria;
import com.deer.wms.system.manage.model.user.UserInfoVO;
import com.deer.wms.system.manage.model.user.UserListVO;
import com.deer.wms.system.manage.service.UserInfoService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -30,7 +39,7 @@ import java.util.List;
/**
* Created by on 2020/08/18.
*/
@Api(description = "xxx接口")
@Api(description = "订单接口")
@RestController
@RequestMapping("/mt/alone/by/order/infos")
public class MtAloneByOrderInfoController {
@@ -38,6 +47,18 @@ public class MtAloneByOrderInfoController {
@Autowired
private MtAloneByOrderInfoService mtAloneByOrderInfoService;
@Autowired
private ClientManageService clientManageService;
@Autowired
private UserInfoService userInfoService;
@Autowired
private MtAloneByProductInfoService mtAloneByProductInfoService;
@Autowired
private MtAloneByOrderInfoMapping mtAloneByOrderInfoMapping;
@OperateLog(description = "添加xxx", type = "增加")
@ApiOperation(value = "添加xxx", notes = "添加xxx")
@PostMapping("/add")
@@ -51,16 +72,22 @@ public class MtAloneByOrderInfoController {
return ResultGenerator.genSuccessResult();
}
@OperateLog(description = "删除xxx", type = "删除")
@ApiOperation(value = "删除xxx", notes = "删除xxx")
@OperateLog(description = "删除订单", type = "删除")
@ApiOperation(value = "删除订单", notes = "删除订单")
@DeleteMapping("/delete/{id}")
public Result delete(@PathVariable Integer Id) {
mtAloneByProductInfoService.deleteByOrderInfoId(Id);
mtAloneByOrderInfoService.deleteById(Id);
return ResultGenerator.genSuccessResult();
}
@OperateLog(description = "修改xxx", type = "更新")
@ApiOperation(value = "修改xxx", notes = "修改xxx")
/**
* 修改保存
* @param mtAloneByOrderInfo
* @return
*/
@OperateLog(description = "修改订单", type = "更新")
@ApiOperation(value = "修改订单", notes = "修改订单")
@PostMapping("/update")
public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) {
mtAloneByOrderInfo.setUpdateTime(new Date());
@@ -68,13 +95,32 @@ public class MtAloneByOrderInfoController {
return ResultGenerator.genSuccessResult();
}
/**
* 修改订单获取修改的数据并填充
* @param id
* @return
*/
@GetMapping("/update/for/data/{id}")
public Result updateForData(@PathVariable Integer id){
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
List<MtAloneByProductInfo> mtAloneByProductInfos = mtAloneByProductInfoService.findByOrderInfoId(id);
MtAloneByOrderInfoVo mtAloneByOrderInfoVo = mtAloneByOrderInfoMapping.MtAloneByOrderInfoToMtAloneByOrderInfoVo(mtAloneByOrderInfo);
mtAloneByOrderInfoVo.setMtAloneByProductInfos(mtAloneByProductInfos);
return ResultGenerator.genSuccessResult(mtAloneByOrderInfoVo);
}
@GetMapping("/detail/{id}")
public Result detail(@PathVariable Integer id) {
MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
return ResultGenerator.genSuccessResult(mtAloneByOrderInfo);
}
/**
* 订单条件列表
*/
@GetMapping("/list")
@ApiOperation(value = "查看订单", notes = "查看")
public Result list(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
@@ -86,10 +132,48 @@ public class MtAloneByOrderInfoController {
params.setCompanyId(null);
}
PageHelper.startPage(params.getPageNum(), params.getPageSize());
//List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
List<MtAloneByAShelf> list = new ArrayList<>();
List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
PageInfo pageInfo = new PageInfo(list);
return ResultGenerator.genSuccessResult(pageInfo);
}
/**
* 添加订单的时候获取uuid作为订单编码
*/
@PostMapping("get/order/code")
public Result getOrderCode(@ApiIgnore @User CurrentUser currentUser){
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
String orderCode = ProduceManagePublicMethod.getUUID();
return ResultGenerator.genSuccessResult(orderCode);
}
/**
* 新增订单的获取客户编码
*/
@PostMapping("get/client/code")
public Result getClientCode(@ApiIgnore @User CurrentUser currentUser){
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
ClientManageCriteria clientManageCriteria = new ClientManageCriteria();
clientManageCriteria.setCompanyId(currentUser.getCompanyId());
List<ClientManage> list = clientManageService.findList(clientManageCriteria);
return ResultGenerator.genSuccessResult(list);
}
/**
* 新增订单的获取跟单员
*/
@PostMapping("get/follow/name")
public Result getFollowName(@ApiIgnore @User CurrentUser currentUser){
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
UserInfoCriteria userInfoCriteria = new UserInfoCriteria();
userInfoCriteria.setCompanyId(currentUser.getCompanyId());
List<UserListVO> list = userInfoService.findUserFormList(userInfoCriteria);
return ResultGenerator.genSuccessResult(list);
}
}