第三方单据修整,模板上传bug

master
anthonywj 2 years ago
parent c3c648eeb9
commit 113a178779

@ -172,6 +172,7 @@ public class ConstantStatus {
public static final int FROM_COPY = 10; //单据复制 public static final int FROM_COPY = 10; //单据复制
public static final int FROM_COUNT = 11; //盘点单据转单 public static final int FROM_COUNT = 11; //盘点单据转单
public static final int FROM_PLAN = 12; //申购计划转单 public static final int FROM_PLAN = 12; //申购计划转单
public static final int FROM_RECEIVE = 13; //领用单据转单
//DI类型 //DI类型

@ -143,12 +143,9 @@ public class IoOrderController extends BaseController {
return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "该产品未指定供应商!"); return ResultVOUtils.error(500, orderDetailBizEntity.getCoName() + "该产品未指定供应商!");
} }
} }
IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); ioAddInoutService.dealBusProcess(orderEntity);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
orderEntity.setUpdateUser(getUserId() + "");
orderService.update(orderEntity);
return ResultVOUtils.success("提交成功!"); return ResultVOUtils.success("提交成功!");
} }

@ -20,10 +20,8 @@ import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.req.inout.AddThrOrderRequest; import com.glxp.api.req.inout.*;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -34,7 +32,9 @@ import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.*;
import com.glxp.api.service.thrsys.ThrOrderDetailService;
import com.glxp.api.service.thrsys.ThrOrderService; import com.glxp.api.service.thrsys.ThrOrderService;
import com.glxp.api.service.thrsys.ThrSystemBusApiService;
import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -72,6 +72,14 @@ public class IoOrderDetailBizController extends BaseController {
private IoCheckInoutService ioCheckInoutService; private IoCheckInoutService ioCheckInoutService;
@Resource @Resource
IoOrderDetailCodeService orderDetailCodeService; IoOrderDetailCodeService orderDetailCodeService;
@Resource
ThrOrderService thrOrderService;
@Resource
ReceiveService receiveService;
@Resource
ReceivedetailService receivedetailService;
@Resource
IBasicBusTypeChangeService basicBusTypeChangeService;
//获取单据业务详情---临时接口查询 //获取单据业务详情---临时接口查询
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -167,44 +175,52 @@ public class IoOrderDetailBizController extends BaseController {
@Resource @Resource
ThrOrderService thrOrderService; ThrOrderDetailService thrOrderDetailService;
@Resource
ThrSystemBusApiService thrSystemBusApiService;
//选入第三方单据至业务单据 //选入第三方单据至业务单据
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addThrOrder") @PostMapping("/udiwms/inout/order/addThrOrder")
public BaseResponse addThrOrder(@RequestBody AddThrOrderRequest addThrOrderRequest, public BaseResponse addThrOrder(@RequestBody ThrOrderEntity thrOrderRequest,
BindingResult bindingResult) { BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
ThrOrderEntity thrOrderEntity = thrOrderService.findById(addThrOrderRequest.getThrOrderId()); ThrOrderEntity thrOrderEntity = thrOrderService.findById(thrOrderRequest.getId());
if (thrOrderEntity == null) { if (thrOrderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT); return ResultVOUtils.error(ResultEnum.DATA_NOT);
} }
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.selectByBillNo(thrOrderRequest.getBillNo());
//获取单据类型
ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiService.selectByThrBus(thrOrderEntity.getBillType(), thrOrderEntity.getThirdSysFk());
if (thrSystemBusApiEntity == null && StrUtil.isEmpty(thrSystemBusApiEntity.getCode())) {
return ResultVOUtils.error(500, "单据类型对照有误!");
}
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(thrSystemBusApiEntity.getCode());
AuthAdmin authAdmin = getUser(); AuthAdmin authAdmin = getUser();
//创建单据 //创建单据
IoOrderEntity orderEntity = new IoOrderEntity(); IoOrderEntity orderEntity = new IoOrderEntity();
// String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
// orderEntity.setBillNo(orderNo); orderEntity.setBillNo(orderNo);
orderEntity.setCreateUser(authAdmin.getId() + ""); orderEntity.setCreateUser(authAdmin.getId() + "");
orderEntity.setCreateTime(new Date()); orderEntity.setCreateTime(new Date());
orderEntity.setUpdateUser(authAdmin.getId() + "");
orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
orderEntity.setCorpOrderId(thrOrderEntity.getBillNo());
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
//todo 单据类型逻辑有误,暂不处理
thrOrderService.updateThrOrder(thrOrderEntity); thrOrderService.updateThrOrder(thrOrderEntity);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@Resource
ReceiveService receiveService;
@Resource
ReceivedetailService receivedetailService;
@Resource
IBasicBusTypeChangeService basicBusTypeChangeService;
//选入领用单据至业务单据 //选入领用单据至业务单据
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/addReceiveOrder") @PostMapping("/udiwms/inout/order/addReceiveOrder")
@ -229,11 +245,18 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setUpdateUser(authAdmin.getId() + ""); orderEntity.setUpdateUser(authAdmin.getId() + "");
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId(authAdmin.getCustomerId() + ""); orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
orderEntity.setCorpOrderId(purReceiveEntity.getBillNo());
orderEntity.setAction(bussinessTypeEntity.getAction()); orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction()); orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode()); orderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
orderEntity.setInvCode(purReceiveEntity.getTargetInvCode()); orderEntity.setInvCode(purReceiveEntity.getTargetInvCode());
orderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo()); orderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
orderEntity.setFromType(ConstantStatus.FROM_RECEIVE);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);
orderEntity.setFromDeptCode(purReceiveEntity.getDeptCode());
orderEntity.setFromInvCode(purReceiveEntity.getInvCode());
orderService.insertOrder(orderEntity); orderService.insertOrder(orderEntity);
for (PurReceiveDetailEntity purReceiveDetailEntity : purReceiveDetailEntities) { for (PurReceiveDetailEntity purReceiveDetailEntity : purReceiveDetailEntities) {
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
@ -253,6 +276,7 @@ public class IoOrderDetailBizController extends BaseController {
ioOrderDetailBizEntity.setExpireDate(purReceiveDetailEntity.getExpireDate()); ioOrderDetailBizEntity.setExpireDate(purReceiveDetailEntity.getExpireDate());
ioOrderDetailBizEntity.setBatchNo(purReceiveDetailEntity.getBatchNo()); ioOrderDetailBizEntity.setBatchNo(purReceiveDetailEntity.getBatchNo());
ioOrderDetailBizEntity.setSupId(purReceiveDetailEntity.getSupId()); ioOrderDetailBizEntity.setSupId(purReceiveDetailEntity.getSupId());
ioOrderDetailBizEntity.setCount(purReceiveDetailEntity.getCount());
orderDetailBizService.insert(ioOrderDetailBizEntity); orderDetailBizService.insert(ioOrderDetailBizEntity);
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
@ -281,4 +305,23 @@ public class IoOrderDetailBizController extends BaseController {
return ResultVOUtils.page(pageInfo); return ResultVOUtils.page(pageInfo);
} }
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/biz/updateBind")
public BaseResponse updateBindSup(@RequestBody BizBindUpdateRequest bizBindUpdateRequest) {
IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(bizBindUpdateRequest.getId());
if (bizBindUpdateRequest.getBindRlFk() != null)
orderDetailBizEntity.setBindRlFk(bizBindUpdateRequest.getBindRlFk());
if (StrUtil.isNotEmpty(bizBindUpdateRequest.getSupId())) {
orderDetailBizEntity.setSupId(bizBindUpdateRequest.getSupId());
}
orderDetailBizService.update(orderDetailBizEntity);
return ResultVOUtils.success("绑定成功");
}
} }

@ -131,16 +131,15 @@ public class SysPdfTemplateController {
} }
@AuthRuleAnnotation("system/pdf/template/delete") @AuthRuleAnnotation("system/pdf/template/delete")
@GetMapping("/system/pdf/template/delete") @PostMapping("/system/pdf/template/delete")
public BaseResponse deleteById(@RequestParam("id") Integer id, public BaseResponse deleteById(@RequestBody SysPdfTemplateSaveRequest sysPdfTemplateSaveRequest) {
@RequestParam("path") String path) {
if (StringUtils.isNotBlank(path)) {//删除文件 if (StringUtils.isNotBlank(sysPdfTemplateSaveRequest.getPath())) {//删除文件
File file = new File(path); File file = new File(sysPdfTemplateSaveRequest.getPath());
file.delete(); file.delete();
} }
boolean b = systemPDFTemplateService.deleteById(id); boolean b = systemPDFTemplateService.deleteById(sysPdfTemplateSaveRequest.getId());
if (b) if (b)
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
else { else {

@ -201,11 +201,11 @@ public class ThrOrderController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
String id = deleteRequest.getId(); String id = deleteRequest.getId();
ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id));
String msg = selectDelect(thrOrderEntity); String msg = selectDelect(thrOrderEntity);
if (msg == null) { if (msg == null) {
boolean b = thrOrderService.deleteById(id); boolean b = thrOrderService.deleteById(id);
thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getId() + ""); thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getBillNo() + "");
if (b) if (b)
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
else return ResultVOUtils.error(500, "无法删除!"); else return ResultVOUtils.error(500, "无法删除!");
@ -325,7 +325,7 @@ public class ThrOrderController {
List<String> ids = postSmpOrderRequest.getIds(); List<String> ids = postSmpOrderRequest.getIds();
for (String id : ids) { for (String id : ids) {
ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); ThrOrderEntity thrOrderEntity = thrOrderService.findById(Integer.parseInt(id));
UploadSmpRequest uploadSmpRequest = new UploadSmpRequest(); UploadSmpRequest uploadSmpRequest = new UploadSmpRequest();
BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest); BeanUtils.copyProperties(thrOrderEntity, uploadSmpRequest);
uploadSmpRequest.setType(1); uploadSmpRequest.setType(1);

@ -1,29 +1,27 @@
package com.glxp.api.dao.thrsys; package com.glxp.api.dao.thrsys;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface ThrOrderDao { public interface ThrOrderDao extends BaseMapperPlus<ThrOrderDao, ThrOrderEntity, ThrOrderEntity> {
List<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); List<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest);
List<ThrOrderEntity> filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest);
boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
boolean importThrOrder(ThrOrderEntity thrCorpEntity); boolean importThrOrder(ThrOrderEntity thrCorpEntity);
boolean insertThrOrders(@Param("thrOrderEntities") List<ThrOrderEntity> thrOrderEntities); boolean insertThrOrders(@Param("thrOrderEntities") List<ThrOrderEntity> thrOrderEntities);
boolean updateThrOrder(ThrOrderEntity thrOrderEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
boolean deleteAll(); boolean deleteAll();

@ -1,7 +1,9 @@
package com.glxp.api.dao.thrsys; package com.glxp.api.dao.thrsys;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -9,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface ThrOrderDetailDao { public interface ThrOrderDetailDao extends BaseMapperPlus<ThrOrderDetailDao, ThrOrderDetailEntity, ThrOrderDetailEntity> {
List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest);
@ -19,7 +21,6 @@ public interface ThrOrderDetailDao {
boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List<ThrOrderDetailEntity> thrOrderDetailEntities); boolean insertThrOrderDetails(@Param("thrOrderDetailEntities") List<ThrOrderDetailEntity> thrOrderDetailEntities);
boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);

@ -1,5 +1,7 @@
package com.glxp.api.dao.thrsys; package com.glxp.api.dao.thrsys;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -8,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface ThrSystemBusApiDao { public interface ThrSystemBusApiDao extends BaseMapperPlus<ThrSystemBusApiDao, ThrSystemBusApiEntity, ThrSystemBusApiEntity> {
boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity); boolean insertSysBusApi(ThrSystemBusApiEntity basicThirdSysEntity);

@ -7,7 +7,7 @@ import java.util.Date;
@Data @Data
public class SystemPDFTemplateEntity { public class SystemPDFTemplateEntity {
private int id; private Integer id;
private String name; private String name;
private int type; private int type;
private int module; private int module;

@ -4,115 +4,196 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** import lombok.Data;
* <p>
*
* </p>
*
* @author
* @since 2023-01-13
*/
@Data
@TableName("thr_order_detail")
public class ThrOrderDetailEntity {
@Data
@TableName(value = "thr_order_detail")
public class ThrOrderDetailEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@TableField("productId") /**
*
*/
@TableField(value = "productId")
private String productId; private String productId;
@TableField("productName") /**
*
*/
@TableField(value = "productName")
private String productName; private String productName;
@TableField("spec") /**
*
*/
@TableField(value = "spec")
private String spec; private String spec;
@TableField("batchNo") /**
*
*/
@TableField(value = "batchNo")
private String batchNo; private String batchNo;
@TableField("expireDate") /**
*
*/
@TableField(value = "expireDate")
private String expireDate; private String expireDate;
@TableField("productDate") /**
*
*/
@TableField(value = "productDate")
private String productDate; private String productDate;
@TableField("count") /**
private int count; *
*/
@TableField(value = "`count`")
private Integer count;
@TableField("reCount") /**
private int reCount; *
*/
@TableField(value = "reCount")
private Integer reCount;
@TableField("orderIdFk") /**
*
*/
@TableField(value = "orderIdFk")
private String orderIdFk; private String orderIdFk;
@TableField("thirdSysFk") /**
*
*/
@TableField(value = "thirdSysFk")
private String thirdSysFk; private String thirdSysFk;
/**
* ID
*/
@TableField(value = "supId")
private String supId;
/**
*
*/
@TableField(value = "supName")
private String supName;
/** /**
* *
*/ */
@TableField("price") @TableField(value = "price")
private BigDecimal price; private BigDecimal price;
/** /**
* *
*/ */
@TableField("corpName") @TableField(value = "corpName")
private String corpName; private String corpName;
/** /**
* *
*/ */
@TableField("ylqxzcrbarmc") @TableField(value = "ylqxzcrbarmc")
private String ylqxzcrbarmc; private String ylqxzcrbarmc;
/** /**
* *
*/ */
@TableField("zczbhhzbapzbh") @TableField(value = "zczbhhzbapzbh")
private String zczbhhzbapzbh; private String zczbhhzbapzbh;
/** /**
* *
*/ */
@TableField("manufactory") @TableField(value = "manufactory")
private String manufactory; private String manufactory;
/** /**
* *
*/ */
@TableField("createUser") @TableField(value = "`createUser`")
private String createUser; private String createUser;
/** /**
* *
*/ */
@TableField("createTime") @TableField(value = "createTime")
private Date createTime; private Date createTime;
/** /**
* *
*/ */
@TableField("updateUser") @TableField(value = "updateUser")
private String updateUser; private String updateUser;
/** /**
* *
*/ */
@TableField("updateTime") @TableField(value = "updateTime")
private Date updateTime; private Date updateTime;
/** /**
* *
*/ */
@TableField("remark") @TableField(value = "remark")
private String remark; private String remark;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "id";
public static final String COL_PRODUCTID = "productId";
public static final String COL_PRODUCTNAME = "productName";
public static final String COL_SPEC = "spec";
public static final String COL_BATCHNO = "batchNo";
public static final String COL_EXPIREDATE = "expireDate";
public static final String COL_PRODUCTDATE = "productDate";
public static final String COL_COUNT = "count";
public static final String COL_RECOUNT = "reCount";
public static final String COL_ORDERIDFK = "orderIdFk";
public static final String COL_THIRDSYSFK = "thirdSysFk";
public static final String COL_SUPID = "supId";
public static final String COL_SUPNAME = "supName";
public static final String COL_PRICE = "price";
public static final String COL_CORPNAME = "corpName";
public static final String COL_YLQXZCRBARMC = "ylqxzcrbarmc";
public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh";
public static final String COL_MANUFACTORY = "manufactory";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATEUSER = "updateUser";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_REMARK = "remark";
} }

@ -18,169 +18,196 @@ import java.util.Date;
*/ */
@Data @Data
@TableName("thr_order") @TableName("thr_order")
public class ThrOrderEntity{ public class ThrOrderEntity {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
private Integer id; private Integer id;
@TableField("billNo") /**
private String billNo; *
*/
@TableField("billdate") @TableField(value = "billFlag")
private String billdate;
@TableField("corpId")
private String corpId;
@TableField("corpName")
private String corpName;
@TableField("billType")
private String billType;
@TableField("billFlag")
private String billFlag; private String billFlag;
@TableField("thirdSysFk")
private String thirdSysFk;
/** /**
* *
*/ */
@TableField("originType") @TableField(value = "billNo")
private String originType; private String billNo;
/** /**
* *
*/ */
@TableField("startDate") @TableField(value = "billdate")
private String startDate; private String billdate;
/** /**
* *
*/ */
@TableField("endDate") @TableField(value = "billType")
private String endDate; private String billType;
/** /**
* *
*/ */
@TableField("reviewUser") @TableField(value = "billTypeName")
private String reviewUser; private String billTypeName;
/** /**
* *
*/ */
@TableField("address") @TableField(value = "corpId")
private String address; private String corpId;
/** /**
* *
*/ */
@TableField("linkMan") @TableField(value = "corpName")
private String linkMan; private String corpName;
/** /**
* * 1:2:
*/ */
@TableField("linkTel") @TableField(value = "inoutType")
private String linkTel; private Byte inoutType;
/** /**
* *
*/ */
@TableField("remark") @TableField(value = "deptCode")
private String remark; private String deptCode;
/** /**
* 1 *
*/ */
@TableField("remark1") @TableField(value = "deptName")
private String remark1; private String deptName;
/** /**
* 2 *
*/ */
@TableField("remark2") @TableField(value = "invCode")
private String remark2; private String invCode;
/** /**
* 3 *
*/ */
@TableField("remark3") @TableField(value = "invName")
private String remark3; private String invName;
@TableField("type")
private Integer type;
@TableField("locStorageCode")
private String locStorageCode;
@TableField("editStatus")
private Integer editStatus;
/** /**
* *
*/ */
@TableField("invWarehouseCode") @TableField(value = "thirdSysFk")
private String invWarehouseCode; private String thirdSysFk;
/** /**
* *
*/ */
@TableField("ylqxzcrbarmc") @TableField(value = "`createUser`")
private String ylqxzcrbarmc; private String createUser;
/** /**
* *
*/ */
@TableField("zczbhhzbapzbh") @TableField(value = "createTime")
private String zczbhhzbapzbh; private Date createTime;
/** /**
* *
*/ */
@TableField("manufactory") @TableField(value = "updateUser")
private String manufactory; private String updateUser;
/** /**
* 1 2 *
*/ */
@TableField("thirdPartyDate") @TableField(value = "updateTime")
private Integer thirdPartyDate; private Date updateTime;
@TableField("unitIdFk") /**
private String unitIdFk; *
*/
@TableField(value = "reviewUser")
private String reviewUser;
/** /**
* *
*/ */
@TableField("fromSubInvCode") @TableField(value = "reviewTime")
private String fromSubInvCode; private Date reviewTime;
/** /**
* *
*/ */
@TableField("createUser") @TableField(value = "address")
private String createUser; private String address;
/** /**
* *
*/ */
@TableField("createTime") @TableField(value = "linkMan")
private Date createTime; private String linkMan;
/** /**
* *
*/ */
@TableField("updateUser") @TableField(value = "linkTel")
private String updateUser; private String linkTel;
/** /**
* *
*/ */
@TableField("updateTime") @TableField(value = "remark")
private Date updateTime; private String remark;
private static final long serialVersionUID = 1L;
public static final String COL_ID = "id";
public static final String COL_BILLFLAG = "billFlag";
public static final String COL_BILLNO = "billNo";
public static final String COL_BILLDATE = "billdate";
public static final String COL_BILLTYPE = "billType";
public static final String COL_BILLTYPENAME = "billTypeName";
public static final String COL_CORPID = "corpId";
public static final String COL_CORPNAME = "corpName";
public static final String COL_INOUTTYPE = "inoutType";
public static final String COL_DEPTCODE = "deptCode";
public static final String COL_DEPTNAME = "deptName";
public static final String COL_INVCODE = "invCode";
public static final String COL_INVNAME = "invName";
public static final String COL_THIRDSYSFK = "thirdSysFk";
public static final String COL_CREATEUSER = "createUser";
public static final String COL_CREATETIME = "createTime";
public static final String COL_UPDATEUSER = "updateUser";
public static final String COL_UPDATETIME = "updateTime";
public static final String COL_REVIEWUSER = "reviewUser";
public static final String COL_REVIEWTIME = "reviewTime";
public static final String COL_ADDRESS = "address";
public static final String COL_LINKMAN = "linkMan";
public static final String COL_LINKTEL = "linkTel";
public static final String COL_REMARK = "remark";
} }

@ -0,0 +1,12 @@
package com.glxp.api.req.inout;
import lombok.Data;
@Data
public class BizBindUpdateRequest {
private Integer id;
private Long bindRlFk;
private String supId;
}

@ -7,7 +7,7 @@ import java.util.Date;
@Data @Data
public class SysPdfTemplateSaveRequest { public class SysPdfTemplateSaveRequest {
private int id; private Integer id;
private String name; private String name;
private int type; private int type;
private int module; private int module;

@ -204,8 +204,8 @@ public class IoOrderResponse {
* 1.2:,3. 稿 * 1.2:,3. 稿
*/ */
private Integer orderType; private Integer orderType;
private Integer fromReceiveBillNo; private String fromReceiveBillNo;
private Integer fromThrBillNo; private String fromThrBillNo;
//是否可以补单 //是否可以补单
private boolean enableSupplementOrder; private boolean enableSupplementOrder;

@ -67,7 +67,7 @@ public class IoAddInoutService {
@Resource @Resource
SystemParamConfigService systemParamConfigService; SystemParamConfigService systemParamConfigService;
//新增单据处理 //新增扫码单据处理
public void dealProcess(IoOrderEntity orderEntity) { public void dealProcess(IoOrderEntity orderEntity) {
orderEntity.setRemark("正在处理!"); orderEntity.setRemark("正在处理!");
@ -224,6 +224,76 @@ public class IoAddInoutService {
} }
//新增业务单据处理
public void dealBusProcess(IoOrderEntity orderEntity) {
orderEntity.setRemark("正在处理!");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESSING);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
List<IoOrderEntity> orderEntities = orderService.isExitRepeat(orderEntity.getCorpOrderId(), orderEntity.getBillNo());
if (CollUtil.isNotEmpty(orderEntities)) {
orderEntity.setRemark("单据重复上传");
orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
return;
}
if (StrUtil.isEmpty(orderEntity.getFromCorp()) && StrUtil.isEmpty(orderEntity.getFromInvCode())) {
orderEntity.setRemark("未选择往来单位");
orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
return;
}
if (StrUtil.isEmpty(orderEntity.getInvCode())) {
orderEntity.setRemark("未选择当前仓库信息");
orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
return;
}
String errMsg = "";
List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo());
if (CollUtil.isNotEmpty(orderDetailBizEntities)) {
for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities) {
if (StrUtil.isEmpty(orderDetailBizEntity.getSupId())) {
errMsg = errMsg + orderDetailBizEntity.getCoName() + "未绑定供应商;";
}
if (orderDetailBizEntity.getBindRlFk() == null) {
errMsg = errMsg + orderDetailBizEntity.getCoName() + "未绑定耗材字典编码;";
}
}
}
if (StrUtil.isNotEmpty(errMsg)) {
orderEntity.setRemark(errMsg);
orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
return;
}
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
return;
}
@Resource
IoOrderDetailBizService orderDetailBizService;
//生成扫码单据详情 //生成扫码单据详情
public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) { public void genOrderDetailCode(IoOrderEntity orderEntity, IoCodeTempEntity codeTempEntity) {

@ -8,6 +8,9 @@ import java.util.List;
public interface IoOrderDetailBizService { public interface IoOrderDetailBizService {
IoOrderDetailBizEntity selectById(Integer id);
List<IoOrderDetailBizEntity> findByOrderId(String orderId); List<IoOrderDetailBizEntity> findByOrderId(String orderId);
int insert(IoOrderDetailBizEntity orderDetailBizEntity); int insert(IoOrderDetailBizEntity orderDetailBizEntity);
@ -20,7 +23,7 @@ public interface IoOrderDetailBizService {
boolean isExit(String billNo); boolean isExit(String billNo);
boolean isExit(Long relId, String bacthNo, Integer ignoreId,String orderId); boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId);
IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo); IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo);

@ -23,6 +23,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
@Resource @Resource
IoOrderDetailBizDao ioOrderDetailBizDao; IoOrderDetailBizDao ioOrderDetailBizDao;
@Override
public IoOrderDetailBizEntity selectById(Integer id) {
return ioOrderDetailBizDao.selectById(id);
}
@Override @Override
public List<IoOrderDetailBizEntity> findByOrderId(String orderId) { public List<IoOrderDetailBizEntity> findByOrderId(String orderId) {
return ioOrderDetailBizDao.selectList(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", orderId)); return ioOrderDetailBizDao.selectList(new QueryWrapper<IoOrderDetailBizEntity>().eq("orderIdFk", orderId));

@ -1,7 +1,6 @@
package com.glxp.api.service.thrsys; package com.glxp.api.service.thrsys;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest;
@ -10,13 +9,15 @@ import java.util.List;
public interface ThrOrderDetailService { public interface ThrOrderDetailService {
List<ThrOrderDetailEntity> selectByBillNo(String billNo);
List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest); List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest);
boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); boolean insertThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean insertThrOrderDetails(List<ThrOrderDetailEntity> thrOrderDetailEntities); boolean insertThrOrderDetails(List<ThrOrderDetailEntity> thrOrderDetailEntities);
boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity); int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity);
boolean deleteById(String id); boolean deleteById(String id);

@ -1,7 +1,6 @@
package com.glxp.api.service.thrsys; package com.glxp.api.service.thrsys;
import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity;
import com.glxp.api.req.thrsys.FilterThrOrderRequest; import com.glxp.api.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.res.thrsys.ThrErpOrderResponse; import com.glxp.api.res.thrsys.ThrErpOrderResponse;
@ -13,8 +12,6 @@ public interface ThrOrderService {
List<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); List<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest);
List<ThrOrderEntity> filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest);
List<ThrErpOrderResponse> filterAllOrders(List<String> billNos, String action); List<ThrErpOrderResponse> filterAllOrders(List<String> billNos, String action);
@ -24,13 +21,13 @@ public interface ThrOrderService {
ThrOrderEntity findReceiveOrder(String billNo); ThrOrderEntity findReceiveOrder(String billNo);
ThrOrderEntity findById(String id); ThrOrderEntity findById(Integer id);
boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
boolean insertThrOrders(List<ThrOrderEntity> thrOrderEntities); boolean insertThrOrders(List<ThrOrderEntity> thrOrderEntities);
boolean updateThrOrder(ThrOrderEntity thrOrderEntity); int updateThrOrder(ThrOrderEntity thrOrderEntity);
boolean deleteById(String id); boolean deleteById(String id);

@ -14,6 +14,9 @@ public interface ThrSystemBusApiService {
ThrSystemBusApiEntity selectByKey(String key, String thirdSys); ThrSystemBusApiEntity selectByKey(String key, String thirdSys);
ThrSystemBusApiEntity selectByThrBus(String action, String thirdSys);
List<ThrSystemBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); List<ThrSystemBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);

@ -1,5 +1,6 @@
package com.glxp.api.service.thrsys.impl; package com.glxp.api.service.thrsys.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.dao.thrsys.ThrOrderDetailDao;
import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
@ -17,6 +18,11 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService {
@Resource @Resource
ThrOrderDetailDao thrOrderDetailDao; ThrOrderDetailDao thrOrderDetailDao;
@Override
public List<ThrOrderDetailEntity> selectByBillNo(String billNo) {
return thrOrderDetailDao.selectList(new QueryWrapper<ThrOrderDetailEntity>().eq("orderIdFk", billNo));
}
@Override @Override
public List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest) { public List<ThrOrderDetailEntity> filterThrOrderDetailDetail(FilterThrOrderDetailRequest filterThrOrderDetailRequest) {
if (filterThrOrderDetailRequest == null) { if (filterThrOrderDetailRequest == null) {
@ -41,8 +47,8 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService {
} }
@Override @Override
public boolean updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) { public int updateThrOrderDetail(ThrOrderDetailEntity thrOrderDetailEntity) {
return thrOrderDetailDao.updateThrOrderDetail(thrOrderDetailEntity); return thrOrderDetailDao.updateById(thrOrderDetailEntity);
} }
@Override @Override

@ -40,19 +40,6 @@ public class ThrOrderServiceImpl implements ThrOrderService {
return data; return data;
} }
@Override
public List<ThrOrderEntity> filterReceiveOrder(FilterThrOrderRequest filterThrOrderRequest) {
if (filterThrOrderRequest == null) {
return Collections.emptyList();
}
if (filterThrOrderRequest.getPage() != null) {
int offset = (filterThrOrderRequest.getPage() - 1) * filterThrOrderRequest.getLimit();
PageHelper.offsetPage(offset, filterThrOrderRequest.getLimit());
}
List<ThrOrderEntity> data = thrOrderDao.filterReceiveOrder(filterThrOrderRequest);
return data;
}
@Override @Override
public List<ThrErpOrderResponse> filterAllOrders(List<String> billNos, String thirdSys) { public List<ThrErpOrderResponse> filterAllOrders(List<String> billNos, String thirdSys) {
@ -154,14 +141,8 @@ public class ThrOrderServiceImpl implements ThrOrderService {
} }
@Override @Override
public ThrOrderEntity findById(String id) { public ThrOrderEntity findById(Integer id) {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); return thrOrderDao.selectById(id);
filterThrOrderRequest.setId(id);
List<ThrOrderEntity> thrOrderEntities = filterThrOrder(filterThrOrderRequest);
if (thrOrderEntities != null && thrOrderEntities.size() > 0) {
return thrOrderEntities.get(0);
}
return null;
} }
@Override @Override
@ -175,8 +156,8 @@ public class ThrOrderServiceImpl implements ThrOrderService {
} }
@Override @Override
public boolean updateThrOrder(ThrOrderEntity thrOrderEntity) { public int updateThrOrder(ThrOrderEntity thrOrderEntity) {
return thrOrderDao.updateThrOrder(thrOrderEntity); return thrOrderDao.updateById(thrOrderEntity);
} }
@Override @Override

@ -1,6 +1,7 @@
package com.glxp.api.service.thrsys.impl; package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.dao.thrsys.ThrSystemBusApiDao; import com.glxp.api.dao.thrsys.ThrSystemBusApiDao;
import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest;
@ -39,6 +40,11 @@ public class ThrSystemBusApiServiceImpl implements ThrSystemBusApiService {
return null; return null;
} }
@Override
public ThrSystemBusApiEntity selectByThrBus(String action, String thirdSys) {
return thrSystemBusApiDao.selectOne(new QueryWrapper<ThrSystemBusApiEntity>().eq("thirdBuyCode", action).eq("thirdSys", thirdSys));
}
@Override @Override
public List<ThrSystemBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { public List<ThrSystemBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) {
return thrSystemBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest); return thrSystemBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest);

@ -2,206 +2,145 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.thrsys.ThrOrderDao"> <mapper namespace="com.glxp.api.dao.thrsys.ThrOrderDao">
<select id="filterThrOrder" parameterType="com.glxp.api.req.thrsys.FilterThrOrderRequest" <select id="filterThrOrder" parameterType="com.glxp.api.req.thrsys.FilterThrOrderRequest"
resultType="com.glxp.api.entity.thrsys.ThrOrderEntity"> resultType="com.glxp.api.entity.thrsys.ThrOrderEntity">
SELECT thr_order.*,thr_bustype_origin.name billTypeName FROM thr_order SELECT thr_order.*, thr_bustype_origin.name billTypeName
left join thr_bustype_origin on thr_order.billType = thr_bustype_origin.action FROM thr_order
<where> left join thr_bustype_origin on thr_order.billType = thr_bustype_origin.action
<if test="billNo != '' and billNo != null">
AND billNo = #{billNo}
</if>
<if test="id != '' and id !=null">
AND thr_order.id = #{id}
</if>
<if test="billAction != '' and billAction !=null">
AND billType = #{billAction}
</if>
<if test="originType != '' and originType !=null">
AND originType = #{originType}
</if>
<if test="type !=null">
AND thr_order.`type` = #{type}
</if>
<if test="billFlag != '' and billFlag !=null">
AND billFlag = #{billFlag}
</if>
<if test="unitIdFk != '' and unitIdFk !=null">
AND unitIdFk = #{unitIdFk}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
<if test="corpName != '' and corpName != null">
AND corpName like concat('%',#{corpName},'%')
</if>
<if test="startDate!=null and startDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
</if>
<if test="endDate!=null and endDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') ]]>
</if>
<if test="editStatus!= null">
AND editStatus = #{editStatus}
</if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(thr_order.updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where>
ORDER BY thr_order.updateTime DESC
</select>
<select id="filterReceiveOrder" parameterType="com.glxp.api.req.thrsys.FilterThrOrderRequest"
resultType="com.glxp.api.entity.thrsys.ThrOrderEntity">
SELECT thr_order.*,basic_bustype_change.originName billTypeName,s1.name as invWarehouseName,s2.name as fromSubInvName FROM thr_order
left join basic_bustype_change on thr_order.billType = basic_bustype_change.originAction
LEFT JOIN inv_warehouse_sub s1 ON thr_order.invWarehouseCode=s1.`code`
LEFT JOIN inv_warehouse_sub s2 ON thr_order.fromSubInvCode=s2.`code`
<where> <where>
<if test="billNo != '' and billNo != null"> <if test="billNo != '' and billNo != null">
AND billNo = #{billNo} AND billNo = #{billNo}
</if> </if>
<if test="id != '' and id !=null"> <if test="id != '' and id != null">
AND thr_order.id = #{id} AND thr_order.id = #{id}
</if> </if>
<if test="billAction != '' and billAction !=null"> <if test="billAction != '' and billAction != null">
AND billType = #{billAction} AND billType = #{billAction}
</if> </if>
<if test="originType != '' and originType !=null"> <if test="billFlag != '' and billFlag != null">
AND originType = #{originType}
</if>
<if test="type !=null">
AND thr_order.`type` = #{type}
</if>
<if test="billFlag != '' and billFlag !=null">
AND billFlag = #{billFlag} AND billFlag = #{billFlag}
</if> </if>
<if test="unitIdFk != '' and unitIdFk !=null">
AND unitIdFk = #{unitIdFk}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null"> <if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk} AND thirdSysFk = #{thirdSysFk}
</if> </if>
<if test="corpName != '' and corpName != null"> <if test="corpName != '' and corpName != null">
AND corpName like concat('%',#{corpName},'%') AND corpName like concat('%', #{corpName}, '%')
</if>
<if test="startDate!=null and startDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
</if>
<if test="endDate!=null and endDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') ]]>
</if> </if>
<if test="editStatus!= null"> <if test="startDate != null and startDate != ''">
AND editStatus = #{editStatus} <![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
]]>
</if> </if>
<if test="thirdPartyDate!= null"> <if test="endDate != null and endDate != ''">
AND thirdPartyDate = #{thirdPartyDate} <![CDATA[
and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
]]>
</if> </if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''"> <if test="lastUpdateTime != null and lastUpdateTime != ''">
<![CDATA[ and DATE_FORMAT(thr_order.updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> <![CDATA[
</if> and DATE_FORMAT(thr_order.updateTime, '%Y-%m-%d %H:%i:%S') >=
<if test="allocateStatus!= null"> DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
AND allocateStatus = #{allocateStatus} ]]>
</if> </if>
</where> </where>
ORDER BY thr_order.updateTime DESC ORDER BY thr_order.updateTime DESC
</select> </select>
<insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity"> <insert id="insertThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity">
replace replace
INTO thr_order INTO thr_order
(id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
remark3, locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus) linkMan, linkTel, remark)
values ( values (#{id},
#{id}, #{billFlag},
#{billNo}, #{billNo},
#{billdate}, #{billdate},
#{corpId}, #{billType},
#{corpName}, #{billTypeName},
#{billType}, #{corpId},
#{billFlag}, #{corpName},
#{thirdSysFk}, #{inoutType},
#{updateTime}, #{deptCode},
#{originType}, #{deptName},
#{unitIdFk}, #{invCode},
#{startDate}, #{invName},
#{endDate}, #{thirdSysFk},
#{createUser}, #{createUser},
#{reviewUser}, #{createTime},
#{address}, #{updateUser},
#{linkMan}, #{updateTime},
#{linkTel}, #{reviewUser},
#{remark}, #{reviewTime},
#{remark1}, #{address},
#{remark2}, #{linkMan},
#{remark3}, #{linkTel},
#{locStorageCode}, #{remark})
#{editStatus},
#{invWarehouseCode},
#{thirdPartyDate},
#{fromSubInvCode},
#{type},
#{allocateStatus}
)
</insert> </insert>
<insert id="importThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity"> <insert id="importThrOrder" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity">
replace replace
INTO thr_order INTO thr_order
(id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, (id, billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
remark3,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) linkMan, linkTel, remark)
values ( values (#{id},
#{id}, #{billFlag},
#{billNo}, #{billNo},
#{billdate}, #{billdate},
#{corpId}, #{billType},
#{corpName}, #{billTypeName},
#{billType}, #{corpId},
#{billFlag}, #{corpName},
#{thirdSysFk}, #{inoutType},
#{updateTime}, #{deptCode},
#{originType}, #{deptName},
#{startDate}, #{invCode},
#{endDate}, #{invName},
#{createUser}, #{thirdSysFk},
#{reviewUser}, #{createUser},
#{address}, #{createTime},
#{linkMan}, #{updateUser},
#{linkTel}, #{updateTime},
#{remark}, #{reviewUser},
#{remark1}, #{reviewTime},
#{remark2}, #{address},
#{remark3}, #{linkMan},
#{invWarehouseCode}, #{linkTel},
#{fromSubInvCode}, #{remark})
#{type},
#{allocateStatus}
)
</insert> </insert>
<insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List"> <insert id="insertThrOrders" keyProperty="id" parameterType="java.util.List">
replace INTO thr_order replace INTO thr_order
(billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk, (billFlag, billNo, billdate, billType, billTypeName, corpId, corpName, inoutType, deptCode, deptName,
startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2, invCode, invName, thirdSysFk, createUser, createTime, updateUser, updateTime, reviewUser, reviewTime, address,
remark3,locStorageCode,editStatus,invWarehouseCode,fromSubInvCode,`type`,allocateStatus) linkMan, linkTel, remark)
values values
<foreach collection="thrOrderEntities" item="item" index="index" <foreach collection="thrOrderEntities" item="item" index="index"
separator=","> separator=",">
(#{item.billNo}, (#{item.billFlag},
#{item.billdate}, #{item.billNo},
#{item.corpId}, #{item.billdate},
#{item.corpName}, #{item.billType},
#{item.billType}, #{item.billTypeName},
#{item.billFlag}, #{item.corpId},
#{item.thirdSysFk}, #{item.updateTime}, #{item.originType}, #{item.unitIdFk}, #{item.corpName},
#{item.startDate}, #{item.endDate}, #{item.createUser}, #{item.reviewUser}, #{item.inoutType},
#{item.address}, #{item.linkMan}, #{item.linkTel}, #{item.remark}, #{item.remark1}, #{item.deptCode},
#{item.remark2}, #{item.deptName},
#{item.remark3},#{item.locStorageCode},#{item.editStatus},#{item.invWarehouseCode},#{item.fromSubInvCode},#{item.type},#{item.allocateStatus} #{item.invCode},
) #{item.invName},
#{item.thirdSysFk},
#{item.createUser},
#{item.createTime},
#{item.updateUser},
#{item.updateTime},
#{item.reviewUser},
#{item.reviewTime},
#{item.address},
#{item.linkMan},
#{item.linkTel},
#{item.remark})
</foreach> </foreach>
</insert> </insert>
@ -215,40 +154,4 @@
DELETE DELETE
FROM thr_order FROM thr_order
</delete> </delete>
<update id="updateThrOrder" parameterType="com.glxp.api.entity.thrsys.ThrOrderEntity">
UPDATE thr_order
<trim prefix="set" suffixOverrides=",">
<if test="billNo != null">billNo=#{billNo},</if>
<if test="billdate != null">billdate=#{billdate},</if>
<if test="corpId != null">corpId=#{corpId},</if>
<if test="corpName != null">corpName=#{corpName},</if>
<if test="billType != null">billType=#{billType},</if>
<if test="billFlag != null">billFlag=#{billFlag},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="originType != null">originType=#{originType},</if>
<if test="startDate != null">startDate=#{startDate},</if>
<if test="endDate != null">endDate=#{endDate},</if>
<if test="createUser != null">createUser=#{createUser},</if>
<if test="reviewUser != null">reviewUser=#{reviewUser},</if>
<if test="address != null">address=#{address},</if>
<if test="linkMan != null">linkMan=#{linkMan},</if>
<if test="linkTel != null">linkTel=#{linkTel},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="remark1 != null">remark1=#{remark1},</if>
<if test="remark2 != null">remark2=#{remark2},</if>
<if test="remark3 != null">remark3=#{remark3},</if>
<if test="locStorageCode != null">locStorageCode=#{locStorageCode},</if>
<if test="editStatus != null">editStatus=#{editStatus},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
<if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
<if test="type != null">`type`=#{type},</if>
<if test="allocateStatus != null">`allocateStatus`=#{allocateStatus},</if>
</trim>
WHERE id = #{id}
</update>
</mapper> </mapper>

@ -2,10 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.thrsys.ThrOrderDetailDao"> <mapper namespace="com.glxp.api.dao.thrsys.ThrOrderDetailDao">
<select id="filterThrOrderDetailDetail" parameterType="com.glxp.api.req.thrsys.FilterThrOrderDetailRequest" <select id="filterThrOrderDetailDetail" parameterType="com.glxp.api.req.thrsys.FilterThrOrderDetailRequest"
resultType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity"> resultType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity">
SELECT * FROM thr_order_detail SELECT *
FROM thr_order_detail
<where> <where>
<if test="orderIdFk != '' and orderIdFk != null"> <if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}
@ -20,69 +20,99 @@
<insert id="insertThrOrderDetail" keyProperty="id" <insert id="insertThrOrderDetail" keyProperty="id"
parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity"> parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity">
replace replace
INTO thr_order_detail INTO thr_order_detail
(productId, productName, spec, batchNo, expireDate, (productId, productName, spec, batchNo, expireDate, productDate, count, reCount, orderIdFk, thirdSysFk, supId,
productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) supName, price, corpName, ylqxzcrbarmc, zczbhhzbapzbh, manufactory, createUser, createTime, updateUser,
values ( updateTime, remark)
#{productId}, values (#{productId},
#{productName}, #{productName},
#{spec}, #{spec},
#{batchNo}, #{batchNo},
#{expireDate}, #{expireDate},
#{productDate}, #{productDate},
#{count}, #{count},
#{reCount}, #{reCount},
#{orderIdFk}, #{orderIdFk},
#{thirdSysFk}, #{thirdSysFk},
#{updateTime}, #{supId},
#{price}, #{supName},
#{corpName}, #{price},
#{ylqxzcrbarmc}, #{corpName},
#{zczbhhzbapzbh}, #{ylqxzcrbarmc},
#{manufactory} #{zczbhhzbapzbh},
) #{manufactory},
#{createUser},
#{createTime},
#{updateUser},
#{updateTime},
#{remark})
</insert> </insert>
<insert id="importThrOrderDetail" keyProperty="id" <insert id="importThrOrderDetail" keyProperty="id"
parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity"> parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity">
replace replace
INTO thr_order_detail INTO thr_order_detail
(id,productId, productName, spec, batchNo, expireDate, (id, productId, productName, spec, batchNo, expireDate, productDate, count, reCount, orderIdFk, thirdSysFk,
productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) supId,
values ( supName, price, corpName, ylqxzcrbarmc, zczbhhzbapzbh, manufactory, createUser, createTime, updateUser,
#{id}, updateTime, remark)
#{productId}, values (#{id},
#{productName}, #{productId},
#{spec}, #{productName},
#{batchNo}, #{spec},
#{expireDate}, #{batchNo},
#{productDate}, #{expireDate},
#{count}, #{productDate},
#{reCount}, #{count},
#{orderIdFk}, #{reCount},
#{thirdSysFk}, #{orderIdFk},
#{updateTime}, #{thirdSysFk},
#{price}, #{supId},
#{corpName}, #{supName},
#{ylqxzcrbarmc}, #{price},
#{zczbhhzbapzbh}, #{corpName},
#{manufactory} #{ylqxzcrbarmc},
) #{zczbhhzbapzbh},
#{manufactory},
#{createUser},
#{createTime},
#{updateUser},
#{updateTime},
#{remark})
</insert> </insert>
<insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true"> <insert id="insertThrOrderDetails" keyProperty="id" parameterType="java.util.List" useGeneratedKeys="true">
replace INTO thr_order_detail replace INTO thr_order_detail
(productId, productName, spec, batchNo, expireDate, (productId, productName, spec, batchNo, expireDate, productDate, count, reCount, orderIdFk, thirdSysFk,
productDate, `count`, reCount, orderIdFk, thirdSysFk, updateTime supId,
, price, corpName,ylqxzcrbarmc,zczbhhzbapzbh,manufactory) supName, price, corpName, ylqxzcrbarmc, zczbhhzbapzbh, manufactory, createUser, createTime, updateUser,
updateTime, remark)
values values
<foreach collection="thrOrderDetailEntities" item="item" index="index" <foreach collection="thrOrderDetailEntities" item="item" index="index"
separator=","> separator=",">
(#{item.productId}, #{item.productName}, #{item.spec}, #{item.batchNo}, #{item.expireDate}, (#{item.productId},
#{item.productDate}, #{item.count}, #{item.reCount}, #{item.orderIdFk}, #{item.thirdSysFk}, #{item.productName},
#{item.updateTime}, #{item.spec},
#{item.price}, #{item.corpName}, #{item.ylqxzcrbarmc}, #{item.zczbhhzbapzbh}, #{item.manufactory}) #{item.batchNo},
#{item.expireDate},
#{item.productDate},
#{item.count},
#{item.reCount},
#{item.orderIdFk},
#{item.thirdSysFk},
#{item.supId},
#{item.supName},
#{item.price},
#{item.corpName},
#{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh},
#{item.manufactory},
#{item.createUser},
#{item.createTime},
#{item.updateUser},
#{item.updateTime},
#{item.remark})
</foreach> </foreach>
</insert> </insert>
@ -97,29 +127,6 @@
WHERE orderIdFk = #{orderIdFk} WHERE orderIdFk = #{orderIdFk}
</delete> </delete>
<update id="updateThrOrderDetail" parameterType="com.glxp.api.entity.thrsys.ThrOrderDetailEntity">
UPDATE thr_order_detail
<trim prefix="set" suffixOverrides=",">
<if test="productId != null">productId=#{productId},</if>
<if test="productName != null">productName=#{productName},</if>
<if test="spec != null">spec=#{spec},</if>
<if test="batchNo != null">batchNo=#{batchNo},</if>
<if test="expireDate != null">expireDate=#{expireDate},</if>
<if test="productDate != null">productDate=#{productDate},</if>
<if test="count != null">count=#{count},</if>
<if test="reCount != null">reCount=#{reCount},</if>
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="price != null">price=#{price},</if>
<if test="corpName != null">corpName=#{corpName},
</if>
<if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
<if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
<if test="manufactory != null">manufactory=#{manufactory},</if>
</trim>
WHERE id = #{id}
</update>
<delete id="deleteAll"> <delete id="deleteAll">
DELETE DELETE
@ -127,8 +134,8 @@
</delete> </delete>
<delete id="deleteByTime"> <delete id="deleteByTime">
Delete From thr_order_detail Delete
where date(updateTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day)) From thr_order_detail
where date(updateTime) &lt;= date(DATE_SUB(NOW(), INTERVAL 30 day))
</delete> </delete>
</mapper> </mapper>
Loading…
Cancel
Save