1.修改第提交单据逻辑
x_z
3 years ago
parent
45119fb179
commit
d82d01f143
@ -0,0 +1,23 @@
|
||||
package com.glxp.mipsdl.admin.constant;
|
||||
|
||||
public interface ConstantType {
|
||||
|
||||
String TYPE_PUT_PRODUCT = "ProduceWareHouseIn"; //生产入库
|
||||
String TYPE_PUT_PURCHASE = "PurchaseWareHouseIn"; //采购入库
|
||||
String TYPE_PUT_RETURN = "ReturnWareHouseIn"; //退货入库
|
||||
String TYPE_PUT_ALLOT = "AllocateWareHouseIn"; //调拨入库
|
||||
|
||||
String TYPE_OUT_SALE = "SalesWareHouseOut"; //销售出库
|
||||
String TYPE_OUT_RETURN = "ReturnWareHouseOut"; //退货出库
|
||||
String TYPE_OUT_ALLOT = "AllocateWareHouseOut"; //调拨出库
|
||||
String TYPE_OUT_DESTORY = "DestoryWareHouseOut"; //销毁出库
|
||||
String TYPE_OUT_STRAIGHT = "DirectAllocateWareHouseOut"; //直调出库
|
||||
String TYPE_OUT_REWORK = "ReworkWareHouseOut"; //返工出库
|
||||
String TYPE_OUT_CHECK = "CheckWareHouseOut"; //盘点 抽检出库
|
||||
String TYPE_CODE_REPLACE = "CodeReplace"; //码替换
|
||||
String TYPE_CODE_DESTORY = "CodeDestory"; //码注销
|
||||
String TYPE_STOCK_CHECK = "StockCheck"; //盘点
|
||||
|
||||
String TYPE_PUT = "WareHouseIn"; //出库
|
||||
String TYPE_OUT = "WareHouseOut"; //入库
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.mipsdl.admin.dao.auth;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.auth.AuthAdmin;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface AuthAdminDao {
|
||||
|
||||
|
||||
/**
|
||||
* 根据id查询
|
||||
*
|
||||
* @param id 传入的id
|
||||
* @return
|
||||
*/
|
||||
AuthAdmin findById(Long id);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity;
|
||||
import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface BasicThirdSysBusApiDao {
|
||||
|
||||
BasicThirdSysBusApiEntity selectByCode(@Param("code") String code);
|
||||
|
||||
boolean insertSysBusApi(com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
boolean updateSysBusApi(com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
List<com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity> filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity;
|
||||
import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BussinessLocalTypeDao {
|
||||
|
||||
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface BussinessTypeDao {
|
||||
|
||||
/**
|
||||
* 根据业务单据编码查询出入库类型
|
||||
*
|
||||
* @param localAction
|
||||
* @return
|
||||
*/
|
||||
String selectInoutTypebByLocalAction(@Param("localAction") String localAction);
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface UdiRelevanceDao {
|
||||
|
||||
UdiRelevanceEntity selectById(@Param("id") String id);
|
||||
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface UnitMaintainDao {
|
||||
|
||||
/**
|
||||
* 根据erpId查询往来单位第三方系统编码和第三方系统名称
|
||||
*
|
||||
* @param erpId
|
||||
* @return
|
||||
*/
|
||||
UnitMaintainEntity selectThirdInfoByErpId(@Param("erpId") String erpId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.mipsdl.admin.dao.business;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
@Mapper
|
||||
public interface StockOrderDao {
|
||||
|
||||
|
||||
StockOrderEntity findById(@Param("id") String id);
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.mipsdl.admin.dao.business;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface StockOrderDetailDao {
|
||||
|
||||
List<StockOrderDetailEntity> findByOrderIdFk(String orderIdFk);
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.mipsdl.admin.dao.business;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface StockOrderUploadLogDao {
|
||||
|
||||
int insert(StockOrderUploadLogEntity record);
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.mipsdl.admin.dao.inout;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface CodesDao {
|
||||
|
||||
|
||||
List<WarehouseEntity> findByReceiptId(@Param("orderId") String orderId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.mipsdl.admin.dao.inout;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface OrderDao {
|
||||
|
||||
OrderEntity findById(String orderId);
|
||||
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.mipsdl.admin.dao.inventory;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface InvWarehouseDao {
|
||||
|
||||
List<InvWarehouseEntity> selectByCode(String code);
|
||||
|
||||
/**
|
||||
* 查询单个仓库
|
||||
*
|
||||
* @param locStorageCode
|
||||
* @return
|
||||
*/
|
||||
InvWarehouseEntity selectOneByCode(String code);
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
package com.glxp.mipsdl.admin.dao.phxyy;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity;
|
||||
import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BasicThirdSysBusApiDao {
|
||||
|
||||
boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
List<BasicThirdSysBusApiEntity> filterSysBusApi(FilterBusTypeRequest filterBasicThirdSysDetailRequest);
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.mipsdl.admin.dao.thrsys;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
|
||||
import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface ThrInvWarehouseDao {
|
||||
|
||||
List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
|
||||
|
||||
ThrInvWarehouseEntity selectByCode(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk);
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package com.glxp.mipsdl.admin.entity.auth;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class AuthAdmin {
|
||||
|
||||
// 主键
|
||||
private Long id;
|
||||
// 昵称
|
||||
private String userName;
|
||||
// 登录密码
|
||||
private String passWord;
|
||||
|
||||
// 最后登录ip
|
||||
private String lastLoginIp;
|
||||
// 最后登录时间
|
||||
private Date lastLoginTime;
|
||||
// 创建时间
|
||||
private Date createTime;
|
||||
// 状态
|
||||
private Integer userFlag;
|
||||
|
||||
private Date lastModifyTime;
|
||||
private String comments;
|
||||
private String employeeName;
|
||||
private Integer CustomerId;
|
||||
private String locInvCode;
|
||||
private String locSubInvCode;
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.glxp.mipsdl.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BasicThirdSysBusApiEntity {
|
||||
|
||||
private Integer id;
|
||||
private String code;
|
||||
private String name;
|
||||
private String thirdBuyName; //第三方系统单据类型名称
|
||||
private String thirdBuyCode; //第三方系统单据类型代码
|
||||
private String thirdSys;
|
||||
private String url;
|
||||
private Integer type;
|
||||
private String remark;
|
||||
private Integer inoutType;
|
||||
|
||||
//扩展字段 暂未启用
|
||||
private String filed;
|
||||
private String filed1;
|
||||
private String filed2;
|
||||
private String filed3;
|
||||
private String filed4;
|
||||
|
||||
|
||||
/**
|
||||
* "code": "29104",
|
||||
* "name": "采购入库",
|
||||
* "remark": "无形资产入库单",
|
||||
* "inoutType": "1"
|
||||
*/
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.mipsdl.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class BussinessLocalTypeEntity {
|
||||
private Integer id;
|
||||
private String action;
|
||||
private String name;
|
||||
private String localAction;
|
||||
private String originAction;
|
||||
private String mainAction;
|
||||
private String localName;
|
||||
private String remark;
|
||||
private boolean checkEnable;
|
||||
private boolean advanceType;
|
||||
private boolean changeEnable;
|
||||
private boolean spUse;
|
||||
private String storageCode;
|
||||
private int corpType;
|
||||
private String defaultUnit;
|
||||
private boolean genUnit;
|
||||
private String thirdAction;
|
||||
private String thirdSys;
|
||||
private Date updateTime;
|
||||
private String prefix;
|
||||
private String localPrefix;
|
||||
private boolean preIn;
|
||||
private boolean outTospms;
|
||||
private boolean ullageFill;
|
||||
private boolean scanPreIn;
|
||||
private boolean vailInv;
|
||||
private boolean codeFillCheck;
|
||||
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package com.glxp.mipsdl.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiRelevanceEntity {
|
||||
|
||||
private String id;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String uuid;
|
||||
private Boolean isUseDy;
|
||||
private String updateTime;
|
||||
private String thirdId1;
|
||||
private String thirdId2;
|
||||
private String thirdId3;
|
||||
private String thirdId4;
|
||||
private String thirdName1;
|
||||
private String thirdName2;
|
||||
private String thirdName3;
|
||||
private String thirdName4;
|
||||
private String manufactory;
|
||||
private String measname;
|
||||
private String ybbm;
|
||||
private String sptm;
|
||||
private Boolean isDisable;
|
||||
private Boolean isLock;
|
||||
private String mainId;
|
||||
private String mainName;
|
||||
private Integer lockStatus;
|
||||
private String udplatCode;
|
||||
private Boolean isAdavence;
|
||||
private String supName;
|
||||
private String originUuid;
|
||||
private String price;
|
||||
private String modifyTime;//修改时间
|
||||
|
||||
private Boolean isCheck;
|
||||
private boolean allowNoBatch;
|
||||
private boolean allowNoExpire;
|
||||
private boolean allowNoProduct;
|
||||
|
||||
//规格型号
|
||||
private String ggxh;
|
||||
|
||||
//器械类别
|
||||
private String qxlb;
|
||||
|
||||
//产品类别
|
||||
private String cplb;
|
||||
|
||||
//分类编码
|
||||
private String flbm;
|
||||
|
||||
//医疗器械注册人
|
||||
private String ylqxzcrbarmc;
|
||||
|
||||
//注册人英文名称
|
||||
private String ylqxzcrbarywmc;
|
||||
|
||||
//统一社会信用号
|
||||
private String tyshxydm;
|
||||
|
||||
//注册证/备案号
|
||||
private String zczbhhzbapzbh;
|
||||
|
||||
//产品描述
|
||||
private String cpms;
|
||||
|
||||
public Integer getLockStatus() {
|
||||
if (lockStatus == null)
|
||||
return 1;
|
||||
return lockStatus;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package com.glxp.mipsdl.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class UnitMaintainEntity {
|
||||
|
||||
public Integer id;
|
||||
public String thirdId;
|
||||
public String thirdName;
|
||||
public String erpId;
|
||||
public String name;
|
||||
public String spell;
|
||||
public String addr;
|
||||
public String status;
|
||||
public String type;
|
||||
public String contact;
|
||||
public String mobile;
|
||||
public String creditNo;
|
||||
|
||||
|
||||
public String thirdId1;
|
||||
public String thirdId2;
|
||||
public String thirdId3;
|
||||
public String thirdId4;
|
||||
public String thirdName1;
|
||||
public String thirdName2;
|
||||
public String thirdName3;
|
||||
public String thirdName4;
|
||||
|
||||
public Date updateTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package com.glxp.mipsdl.admin.entity.business;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class StockOrderDetailEntity {
|
||||
|
||||
private String id;
|
||||
private String orderIdFk;
|
||||
private String productId;
|
||||
private String productName;
|
||||
private String spec;
|
||||
private String batchNo;
|
||||
private String expireDate;
|
||||
private String productDate;
|
||||
private Integer count;
|
||||
private Integer reCount;
|
||||
private Integer sweepCount;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private BigDecimal price;
|
||||
private String relId;
|
||||
|
||||
//销售清单号（第二票）
|
||||
private String secSalesListNo;
|
||||
|
||||
//销售发票号（第一票）
|
||||
private String firstSalesInvNo;
|
||||
|
||||
//销售发票号（第二票）
|
||||
private String secSalesInvNo;
|
||||
|
||||
//开票日期
|
||||
private String invoiceDate;
|
||||
private String manufactory;
|
||||
private boolean allowNoBatch;
|
||||
|
||||
private String code;
|
||||
private String serialNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package com.glxp.mipsdl.admin.entity.business;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class StockOrderEntity {
|
||||
private String id;
|
||||
private String billNo;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private String billdate;
|
||||
private String corpId;
|
||||
private String corpName;
|
||||
private String billType;
|
||||
private String billFlag;
|
||||
private String thirdSysFk;
|
||||
private String status;
|
||||
private String statusInfo;
|
||||
private String type;
|
||||
private String sourceType;
|
||||
private String printStatus;
|
||||
private String unitIdFk;
|
||||
private String customerId;
|
||||
private String thirdOrderFk;
|
||||
private String orderIdFk;
|
||||
private BigDecimal totalPrice;
|
||||
private String locStorageCode;
|
||||
private String invWarehouseCode;
|
||||
private String fromSubInvCode;
|
||||
private String fromSubInvName;
|
||||
//补单单号
|
||||
private String supplementNo;
|
||||
|
||||
private Integer createUser;
|
||||
private Integer reviewUser;
|
||||
|
||||
//审核时间
|
||||
private Date auditTime;
|
||||
//更新时间
|
||||
private Date updateTime;
|
||||
//委托验收已完成
|
||||
private boolean entrustEnd;
|
||||
|
||||
|
||||
private String billTypeName;
|
||||
private String subInvName;
|
||||
private String invName;
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.glxp.mipsdl.admin.entity.business;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 业务单据上传日志
|
||||
*/
|
||||
@Data
|
||||
public class StockOrderUploadLogEntity {
|
||||
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 单据号
|
||||
*/
|
||||
private String billNo;
|
||||
|
||||
/**
|
||||
* 单据日期
|
||||
*/
|
||||
private Date billDate;
|
||||
|
||||
/**
|
||||
* 单据类型
|
||||
*/
|
||||
private String billType;
|
||||
|
||||
/**
|
||||
* 第三方单据号
|
||||
*/
|
||||
private String thrBillNo;
|
||||
|
||||
/**
|
||||
* 提交时间
|
||||
*/
|
||||
private Date submitTime;
|
||||
|
||||
/**
|
||||
* 提交状态 0.未提交 1.正在处理 2.已提交 3.提交失败
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 结果信息
|
||||
*/
|
||||
private String result;
|
||||
|
||||
private String billTypeName;
|
||||
|
||||
private Integer fromType;
|
||||
private String uploadData;
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package com.glxp.mipsdl.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class OrderEntity {
|
||||
|
||||
private String id;
|
||||
private String corpOrderId;
|
||||
private String action;
|
||||
private String actDate;
|
||||
|
||||
private String actor;
|
||||
private String mainAction;
|
||||
private String fromCorpId;
|
||||
private String fromCorp;
|
||||
private Integer status;
|
||||
|
||||
private Integer fromType;
|
||||
private Integer contrastStatus;
|
||||
private String erpFk;
|
||||
private Integer signStatus;
|
||||
private String stockCheckFk;
|
||||
private String remark;
|
||||
private Integer receiveStatus;
|
||||
private String supId;
|
||||
|
||||
|
||||
private String customerId;
|
||||
|
||||
private Integer exportStatus;
|
||||
private String exportFilePath;
|
||||
private Integer dlCount;
|
||||
private String invStorageCode;
|
||||
private String invWarehouseCode;
|
||||
private String locStorageCode;
|
||||
|
||||
//补单单号
|
||||
private String supplementNo;
|
||||
private String ullageSupNo;
|
||||
private Integer createUser;
|
||||
private Integer reviewUser;
|
||||
|
||||
private boolean isError;
|
||||
private boolean outChangeEnable;
|
||||
private String originUllageSupNo;
|
||||
private Date updateTime;
|
||||
private boolean preCheck;
|
||||
//审核时间
|
||||
private Date auditTime;
|
||||
private String thirdBillNo;
|
||||
|
||||
//复制单号，多个单号之间使用英文逗号,分隔
|
||||
private String replicateNo;
|
||||
|
||||
private boolean syncOutChange;
|
||||
private String createTime;
|
||||
private String fromSubInvCode;
|
||||
|
||||
|
||||
private String billTypeName;
|
||||
private String subInvName;
|
||||
private String invName;
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
package com.glxp.mipsdl.admin.entity.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class WarehouseEntity {
|
||||
private Long id;
|
||||
private String action;
|
||||
private String mainAction;
|
||||
private String code;
|
||||
private String corpOrderId;
|
||||
private String actor;
|
||||
private String actDate;
|
||||
private String fromCorpId;
|
||||
private String fromCorp;
|
||||
private String orderId;
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
private String serialNo;
|
||||
private Integer count;
|
||||
private String packageLevel;
|
||||
private String warehouseCode;
|
||||
|
||||
private String customerId;
|
||||
private String nameCode;
|
||||
private Integer sCount;
|
||||
private String supId;//供应商ID
|
||||
private String supName;
|
||||
private String invStorageCode;
|
||||
private String invWarehouseCode;
|
||||
private String relId;
|
||||
private Integer status;
|
||||
private String locStorageCode;
|
||||
private String fromSubInvCode;
|
||||
|
||||
private String mySupId;
|
||||
|
||||
public String getSupId() {
|
||||
|
||||
if (supId == null) {
|
||||
return null;
|
||||
} else if (supId.equals(""))
|
||||
return null;
|
||||
return supId;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
|
||||
if (count == null) {
|
||||
return 1;
|
||||
}
|
||||
if (count == 0)
|
||||
return 1;
|
||||
return count;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.glxp.mipsdl.admin.entity.inventory;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class InvWarehouseEntity {
|
||||
private Integer id;
|
||||
private Integer pid;
|
||||
private String code;
|
||||
private String name;
|
||||
private Boolean advanceType;
|
||||
private Boolean isDefault;
|
||||
private Integer status;
|
||||
private Date updateTime;
|
||||
private String remark;
|
||||
private Integer level;
|
||||
private String pcode;
|
||||
private String pName;
|
||||
|
||||
/**
|
||||
* 第三方仓库ID
|
||||
*/
|
||||
private String thirdId;
|
||||
private String thirdId1;
|
||||
private String thirdId2;
|
||||
private String thirdId3;
|
||||
private String thirdId4;
|
||||
|
||||
private boolean spUse;
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.mipsdl.admin.entity.thrsys;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 第三方仓库信息
|
||||
*/
|
||||
@Data
|
||||
public class ThrInvWarehouseEntity {
|
||||
|
||||
private Integer id;
|
||||
private Integer pid;
|
||||
private String code;
|
||||
private String name;
|
||||
private Boolean advanceType;
|
||||
private Boolean isDefault;
|
||||
private Integer status;
|
||||
private Date updateTime;
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 仓库等级
|
||||
*/
|
||||
private Integer level;
|
||||
|
||||
/**
|
||||
* 父级仓库编码
|
||||
*/
|
||||
private String pcode;
|
||||
|
||||
/**
|
||||
* 第三方系统标识
|
||||
*/
|
||||
private String thirdSysFk;
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package com.glxp.mipsdl.admin.req.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BussinessLocalTypeFilterRequest {
|
||||
private String action;
|
||||
private String name;
|
||||
private String mainAction;
|
||||
private Boolean enabled;
|
||||
private String originAction;
|
||||
private Boolean changeEnable;
|
||||
private Boolean isFilterBind;
|
||||
private Boolean spUse;
|
||||
private Boolean isFilter;
|
||||
private String code;
|
||||
private Integer userId;
|
||||
private String lastUpdateTime;
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.mipsdl.admin.req.thrsys;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class FilterThrInvWarehouseRequest{
|
||||
|
||||
private Integer id;
|
||||
private Integer pid;
|
||||
private String code;
|
||||
private String name;
|
||||
private Boolean advanceType;
|
||||
private Boolean isDefault;
|
||||
private Date updateTime;
|
||||
private String key;
|
||||
private String pcode;
|
||||
private Integer level;
|
||||
|
||||
private String lastUpdateTime;
|
||||
|
||||
/**
|
||||
* 第三方系统标识
|
||||
*/
|
||||
private String thirdSysFk;
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.auth.AuthAdminDao">
|
||||
|
||||
<select id="findById" parameterType="hashmap" resultType="com.glxp.mipsdl.admin.entity.auth.AuthAdmin">
|
||||
SELECT *
|
||||
FROM auth_user
|
||||
<where>
|
||||
id = #{id}
|
||||
</where>
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao">
|
||||
|
||||
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity">
|
||||
select *
|
||||
from basic_third_sys_bus_api
|
||||
where code = #{code}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao">
|
||||
|
||||
<select id="filterJoin" parameterType="com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest"
|
||||
resultType="com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity">
|
||||
SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action
|
||||
localAction,originAction,
|
||||
basic_bussiness_type.name ,
|
||||
basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable,
|
||||
basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
|
||||
,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn,
|
||||
basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
|
||||
FROM basic_bustype_local
|
||||
inner join basic_bussiness_type
|
||||
on basic_bustype_local.action = basic_bussiness_type.localAction
|
||||
<where>
|
||||
<if test="name != ''and name != null">
|
||||
AND basic_bustype_local.name LIKE concat('%',#{name},'%')
|
||||
</if>
|
||||
<if test="action != ''and action != null">
|
||||
AND basic_bustype_local.action LIKE concat(#{action},'%')
|
||||
</if>
|
||||
<if test="enabled != ''and enabled != null">
|
||||
AND basic_bussiness_type.enable =#{enabled}
|
||||
</if>
|
||||
<if test="spUse != ''and spUse != null">
|
||||
AND basic_bustype_local.spUse =#{spUse}
|
||||
</if>
|
||||
</where>
|
||||
group by basic_bussiness_type.action
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao">
|
||||
|
||||
<select id="selectInoutTypebByLocalAction" resultType="java.lang.String">
|
||||
select mainAction
|
||||
from basic_bussiness_type
|
||||
where localAction = #{localAction}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao">
|
||||
|
||||
<select id="selectById" parameterType="java.lang.String"
|
||||
resultType="com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity">
|
||||
select *
|
||||
FROM basic_udirel
|
||||
WHERE id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.basic.UnitMaintainDao">
|
||||
|
||||
|
||||
<select id="selectThirdInfoByErpId" resultType="com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity">
|
||||
select thirdId, thirdName
|
||||
from basic_corp
|
||||
where erpId = #{erpId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.business.StockOrderDao">
|
||||
|
||||
<select id="findById" resultType="com.glxp.mipsdl.admin.entity.business.StockOrderEntity">
|
||||
select *
|
||||
from stock_order
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao">
|
||||
|
||||
|
||||
<select id="findByOrderIdFk" resultType="com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity">
|
||||
select * from stock_order_detail where orderIdFk = #{orderIdFk}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table stock_order_upload_log-->
|
||||
<id column="id" jdbcType="INTEGER" property="id"/>
|
||||
<result column="billNo" jdbcType="VARCHAR" property="billNo"/>
|
||||
<result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
|
||||
<result column="billType" jdbcType="VARCHAR" property="billType"/>
|
||||
<result column="thrBillNo" jdbcType="VARCHAR" property="thrBillNo"/>
|
||||
<result column="submitTime" jdbcType="TIMESTAMP" property="submitTime"/>
|
||||
<result column="status" jdbcType="INTEGER" property="status"/>
|
||||
<result column="result" jdbcType="VARCHAR" property="result"/>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result`
|
||||
</sql>
|
||||
<insert id="insert" keyColumn="id" keyProperty="id"
|
||||
parameterType="com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
|
||||
<!--@mbg.generated-->
|
||||
insert into stock_order_upload_log (billNo, billDate, billType,
|
||||
thrBillNo, submitTime, `status`,
|
||||
`result`,fromType)
|
||||
values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billType,jdbcType=VARCHAR},
|
||||
#{thrBillNo,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
|
||||
#{result,jdbcType=VARCHAR},#{fromType})
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.inout.CodesDao">
|
||||
|
||||
<select id="findByReceiptId" parameterType="Map" resultType="com.glxp.mipsdl.admin.entity.inout.WarehouseEntity">
|
||||
SELECT *
|
||||
FROM io_codes
|
||||
WHERE `orderId` = #{orderId}
|
||||
AND 'action' <![CDATA[ <> ]]> 'StockCheck'
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.inout.OrderDao">
|
||||
|
||||
|
||||
<select id="findById" resultType="com.glxp.mipsdl.admin.entity.inout.OrderEntity">
|
||||
select *
|
||||
from io_order
|
||||
where id = #{orderId}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao">
|
||||
|
||||
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity">
|
||||
select *, name as pName from inv_warehouse where code = #{code}
|
||||
</select>
|
||||
<select id="selectOneByCode" resultType="com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity">
|
||||
select *, name as pName from inv_warehouse where code = #{code} limit 1
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,60 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao">
|
||||
|
||||
<select id="filterThrInvWarehouse" parameterType="com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest"
|
||||
resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity">
|
||||
SELECT *
|
||||
FROM thr_inv_warehouse thrInv
|
||||
left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
|
||||
<where>
|
||||
thrSys.enabled = true
|
||||
<if test="id != '' and id != null">
|
||||
AND id = #{id}
|
||||
</if>
|
||||
<if test="pid != '' and pid != null">
|
||||
AND pid = #{pid}
|
||||
</if>
|
||||
<if test="code != '' and code != null">
|
||||
AND code = #{code}
|
||||
</if>
|
||||
<if test="name != '' and name != null">
|
||||
AND name = #{name}
|
||||
</if>
|
||||
<if test="advanceType != null">
|
||||
AND advanceType = #{advanceType}
|
||||
</if>
|
||||
<if test="isDefault != null">
|
||||
AND isDefault = #{isDefault}
|
||||
</if>
|
||||
<if test="key != null">
|
||||
and (code like concat('%', #{key}, '%')
|
||||
or `name` like concat('%', #{key}, '%'))
|
||||
</if>
|
||||
<if test="lastUpdateTime != null and lastUpdateTime != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
|
||||
]]>
|
||||
</if>
|
||||
<if test="thirdSysFk != null">
|
||||
and thirdSysFk = #{thirdSysFk}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectByCode" resultType="com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity">
|
||||
select * from thr_inv_warehouse thrInv
|
||||
left join basic_third_sys thrSys on thrInv.thirdSysFk = thrSys.thirdId
|
||||
<where>
|
||||
<if test="code != '' and code != null">
|
||||
AND code = #{code}
|
||||
</if>
|
||||
<if test="thirdSysFk != '' and thirdSysFk != null">
|
||||
AND thirdSysFk = #{thirdSysFk}
|
||||
</if>
|
||||
</where>
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue