单据详情修改，库存，预验收库存等创建
anthonywj
2 years ago
parent
3124dd50cb
commit
83868df12c
@ -0,0 +1,103 @@
|
||||
package com.glxp.api.controller.inout;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.Constant;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.auth.AuthAdmin;
|
||||
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.req.inout.AddBizProductReqeust;
|
||||
import com.glxp.api.req.system.DeleteRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
||||
import com.glxp.api.service.basic.UdiRelevanceService;
|
||||
import com.glxp.api.service.inout.IoOrderDetailBizService;
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 单据业务详情
|
||||
*/
|
||||
|
||||
@RestController
|
||||
public class IoOrderDetailBizController extends BaseController {
|
||||
|
||||
@Resource
|
||||
IoOrderService orderService;
|
||||
@Resource
|
||||
IoOrderDetailBizService orderDetailBizService;
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
@Resource
|
||||
GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
private IBasicBussinessTypeService basicBussinessTypeService;
|
||||
|
||||
//录入业务单据详情
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udiwms/inout/order/addBizProduct")
|
||||
public BaseResponse addBizProduct(@RequestBody AddBizProductReqeust addBizProductReqeust) {
|
||||
|
||||
AuthAdmin authAdmin = getUser();
|
||||
if (addBizProductReqeust.getRelId() == null)
|
||||
return ResultVOUtils.error(500, "未选择产品信息");
|
||||
if (addBizProductReqeust.getOrderEntity() == null)
|
||||
return ResultVOUtils.error(500, "未指定订单");
|
||||
IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity();
|
||||
if (StrUtil.isEmpty(orderEntity.getBillNo())) {
|
||||
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
|
||||
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
|
||||
orderEntity.setBillNo(orderNo);
|
||||
orderEntity.setCreateUser(authAdmin.getId() + "");
|
||||
orderEntity.setCreateTime(new Date());
|
||||
}
|
||||
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(addBizProductReqeust.getRelId());
|
||||
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
|
||||
ioOrderDetailBizEntity.setOrderIdFk(orderEntity.getBillNo());
|
||||
ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId());
|
||||
ioOrderDetailBizEntity.setUuidFk(udiRelevanceResponse.getUuid());
|
||||
ioOrderDetailBizEntity.setCoName(udiRelevanceResponse.getCpmctymc());
|
||||
ioOrderDetailBizEntity.setCertCode(udiRelevanceResponse.getZczbhhzbapzbh());
|
||||
ioOrderDetailBizEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc());
|
||||
ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory());
|
||||
ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname());
|
||||
ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh());
|
||||
ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice());
|
||||
orderDetailBizService.insert(ioOrderDetailBizEntity);
|
||||
orderEntity.setUpdateTime(new Date());
|
||||
orderEntity.setUpdateUser(authAdmin.getId() + "");
|
||||
orderService.insertOrUpdate(orderEntity);
|
||||
return ResultVOUtils.success(orderEntity);
|
||||
}
|
||||
|
||||
//修改业务单据详情
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udiwms/inout/order/updateBizProduct")
|
||||
public BaseResponse updateBizProduct(@RequestBody IoOrderDetailBizEntity orderDetailBizEntity) {
|
||||
boolean isExit = orderDetailBizService.isExit(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo());
|
||||
if (isExit) {
|
||||
return ResultVOUtils.error(500, "存在相同产品，相同批次号，请检查后保存！");
|
||||
}
|
||||
return orderDetailBizService.update(orderDetailBizEntity) > 0 ? ResultVOUtils.success("保存成功！") : ResultVOUtils.error(500, "保存失败");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/udiwms/inout/order/delBizProduct")
|
||||
public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {
|
||||
return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("保存成功！") : ResultVOUtils.error(500, "保存失败");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "inv_prein_detail")
|
||||
public class InvPreinDetailEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 条码
|
||||
*/
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 单据号外键
|
||||
*/
|
||||
@TableField(value = "orderId")
|
||||
private String orderId;
|
||||
|
||||
/**
|
||||
* 最小销售表示
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "produceDate")
|
||||
private String produceDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 序列号
|
||||
*/
|
||||
@TableField(value = "serialNo")
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* 耗材字典主键
|
||||
*/
|
||||
@TableField(value = "relId")
|
||||
private Integer relId;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "inv_prein_order")
|
||||
public class InvPreinOrderEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 单据号
|
||||
*/
|
||||
@TableField(value = "billNo")
|
||||
private String billNo;
|
||||
|
||||
/**
|
||||
* 单据类型
|
||||
*/
|
||||
@TableField(value = "`action`")
|
||||
private String action;
|
||||
|
||||
/**
|
||||
* 往来单位
|
||||
*/
|
||||
@TableField(value = "fromCorp")
|
||||
private String fromCorp;
|
||||
|
||||
/**
|
||||
* 来源
|
||||
*/
|
||||
@TableField(value = "fromType")
|
||||
private String fromType;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "`createUser`")
|
||||
private String createUser;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 验收人
|
||||
*/
|
||||
@TableField(value = "reviewUser")
|
||||
private String reviewUser;
|
||||
|
||||
/**
|
||||
* 验收时间
|
||||
*/
|
||||
@TableField(value = "auditTime")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
@TableField(value = "customerId")
|
||||
private Integer customerId;
|
||||
|
||||
/**
|
||||
* 当前仓库
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,120 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "inv_product_detail")
|
||||
public class InvProductDetailEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* UDI码
|
||||
*/
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 订单号外键
|
||||
*/
|
||||
@TableField(value = "orderId")
|
||||
private String orderId;
|
||||
|
||||
/**
|
||||
* 耗材字典ID
|
||||
*/
|
||||
@TableField(value = "relId")
|
||||
private String relId;
|
||||
|
||||
/**
|
||||
* 最小销售标识
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "produceDate")
|
||||
private Date produceDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private Date expireDate;
|
||||
|
||||
/**
|
||||
* 序列号
|
||||
*/
|
||||
@TableField(value = "serialNo")
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* 供应商
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private Integer supId;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private String reCount;
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@TableField(value = "deptCode")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 仓库编码
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 货位编码
|
||||
*/
|
||||
@TableField(value = "invSpaceCode")
|
||||
private String invSpaceCode;
|
||||
|
||||
/**
|
||||
* 原始编码
|
||||
*/
|
||||
@TableField(value = "originCode")
|
||||
private String originCode;
|
||||
|
||||
/**
|
||||
* 采购类型
|
||||
*/
|
||||
@TableField(value = "purchaseType")
|
||||
private String purchaseType;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "inv_product")
|
||||
public class InvProductEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 耗材字典ID
|
||||
*/
|
||||
@TableField(value = "relIdFk")
|
||||
private String relIdFk;
|
||||
|
||||
/**
|
||||
* 最小销售标识
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "productionDate")
|
||||
private Date productionDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private Date expireDate;
|
||||
|
||||
/**
|
||||
* 入库数量
|
||||
*/
|
||||
@TableField(value = "inCount")
|
||||
private String inCount;
|
||||
|
||||
/**
|
||||
* 出库数量
|
||||
*/
|
||||
@TableField(value = "outCount")
|
||||
private String outCount;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private String reCount;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
@TableField(value = "customerId")
|
||||
private Integer customerId;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private Integer supId;
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@TableField(value = "deptCode")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 仓库编码
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddBizProductReqeust {
|
||||
|
||||
private IoOrderEntity orderEntity;
|
||||
private Long relId;
|
||||
private String zczbhhzbapzbh;
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterOrderBizRequest {
|
||||
|
||||
private Long relId;
|
||||
private String batchNo;
|
||||
}
|
||||
Loading…
Reference in New Issue