UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础信息相关修改

Browse Source
dev
anthonywj 2 years ago
parent 17a0e0b99c
commit 5c0a78e70c
18 changed files with 548 additions and 189 deletions
Show Stats Download Patch File Download Diff File

49
src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java
Unescape Escape View File

@ -104,6 +104,21 @@ public class InvWarehouseController extends BaseController {
return ResultVOUtils.success(invSubWarehouseEntities);
}
/**
* 获取供应商可使用单据类型
*
* @param filterInvWarehouseRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterGroupBySpuse")
public BaseResponse filterGroupBySpuse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setUserId(getUserId());
List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest);
return ResultVOUtils.success(invSubWarehouseEntities);
}
/**
* 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
*
@ -618,38 +633,6 @@ public class InvWarehouseController extends BaseController {
List<String> idList = new ArrayList<>(Arrays.asList(bussinessTypeFilterRequest.getIds().split(",")));
bussinessTypeFilterRequest.setActionList(idList);
}
// if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) {
// BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction());
// if (bussinessLocalTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
// bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT);
// } else {
// bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
// }
//
// bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType());
// }
//
// //查询该仓库绑定的单据
// List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntityList = warehouseBussinessTypeService.getListByCode(bussinessTypeFilterRequest.getCode());
// List<BussinessTypResponse> bussinessTypeEntities;
// bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
// for (BussinessTypResponse w1 : bussinessTypeEntities) {
// for (WarehouseBussinessTypeEntity w2 : warehouseBussinessTypeEntityList) {
// if (w1.getAction().equals(w2.getAction())) {
// w1.setCheckSelect(true);
// break;
// }
// }
// }
//
// PageInfo<BussinessTypResponse> pageInfo;
// pageInfo = new PageInfo<>(bussinessTypeEntities);
// PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
// pageSimpleResponse.setTotal(pageInfo.getTotal());
// pageSimpleResponse.setList(bussinessTypeEntities);
// return ResultVOUtils.success(pageSimpleResponse);
return null;
}
@ -690,8 +673,6 @@ public class InvWarehouseController extends BaseController {
@PostMapping("/warehouse/inout/getDeptById")
public BaseResponse getDeptById(@RequestBody List<Integer> deptIds) {
// List<DeptEntity> list = deptService.getDeptById(deptIds);
// return ResultVOUtils.success(list);
return null;
}

8
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -133,9 +133,11 @@ public class IoPurChangeService {
purPlanEntity.setRemark(purApplyEntity.getRemark());
purPlanEntity.setEmergency(purApplyEntity.getEmergency());
purPlanEntity.setArrivalTime(purApplyEntity.getArrivalTime());
purPlanEntity.setInvCode(purApplyEntity.getInvCode());
purPlanEntity.setDeptCode(purApplyEntity.getDeptCode());
purPlanEntity.setInvCode(purApplyEntity.getTargetInvCode());
purPlanEntity.setDeptCode(purApplyEntity.getTargetDeptCode());
purPlanEntity.setCreateUser(purApplyEntity.getAuditUser());
purPlanEntity.setApplyCreateUser(purApplyEntity.getCreateUser());
purPlanEntity.setApplyRemark(purApplyEntity.getRemark());
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {
purPlanEntity.setCreateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
purPlanEntity.setUpdateTime(DateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
@ -219,6 +221,8 @@ public class IoPurChangeService {
purOrderEntity.setArrivalTime(purPlanEntity.getArrivalTime());
purOrderEntity.setInvCode(purPlanEntity.getInvCode());
purOrderEntity.setDeptCode(purPlanEntity.getDeptCode());
purOrderEntity.setApplyRemark(purPlanEntity.getApplyRemark());
purOrderEntity.setApplyCreateUser(purPlanEntity.getApplyCreateUser());
purOrderEntity.setCreateUser(purPlanEntity.getAuditUser());
purOrderEntity.setUpdateUser(purPlanEntity.getAuditUser());
if (basicBusTypeChangeEntity.getBusBeforeTime() != null) {

2
src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java
Unescape Escape View File

@ -19,6 +19,8 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
List<InvWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
List<InvWarehouseEntity> filterGroupBySpuse(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity);

2
src/main/java/com/glxp/api/entity/basic/ProductInfoEntity.java
Unescape Escape View File

@ -66,7 +66,7 @@ public class ProductInfoEntity {
private String syqsfxyjxmj;
private String qtxxdwzlj;
private String mjfs;
private String categoryName;
//自定义字典
private boolean check;

8
src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
Unescape Escape View File

@ -85,6 +85,14 @@ public class UdiProductEntity {
private String pinyinInitial;
private String sfwblztlcp;
private String cgzmraqxgxx;
private String sfbjwycxsy;
private String sfwwjbz;
private String syqsfxyjxmj;
private String mjfs;
private String categoryName;
public Boolean getAllowNoBatch() {
if (allowNoBatch == null)

9
src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -113,6 +113,14 @@ public class UdiRelevanceResponse {
private Integer zdcfsycs;
private String customerId;
private String sfwblztlcp;
private String cgzmraqxgxx;
private String sfbjwycxsy;
private String sfwwjbz;
private String syqsfxyjxmj;
private String mjfs;
private String categoryName;
private Integer bpcrid;
@ -143,7 +151,6 @@ public class UdiRelevanceResponse {
}
public Boolean getUseDy() {
if (isUseDy == null)
return false;

4
src/main/java/com/glxp/api/service/auth/InvWarehouseService.java
Unescape Escape View File

@ -27,6 +27,8 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
List<InvWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
List<InvWarehouseEntity> filterGroupBySpuse(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
List<InvWarehouseEntity> findByParentId(String code);
@ -99,4 +101,6 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
List<InvWarehouseEntity> findByLastTime(Date lastUpdateTime);
List<InvWarehouseEntity> selectLowWarehouseAll(String pCode);
}

13
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -102,6 +102,19 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
return data;
}
@Override
public List<InvWarehouseEntity> filterGroupBySpuse(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
if (filterInvSubWarehouseRequest == null) {
return Collections.emptyList();
}
if (filterInvSubWarehouseRequest.getPage() != null) {
int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invWarehouseDao.filterGroupBySpuse(filterInvSubWarehouseRequest);
return data;
}
@Override
public InvWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
return invWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);

2
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -669,7 +669,7 @@ public class IoOrderServiceImpl implements IoOrderService {
break;
case Constant.ORDER_STATUS_INCODE:
filterOrderRequest.setStatuses(Arrays.asList(1, 3, 5, 10, 7));
filterOrderRequest.setStatuses(Arrays.asList(1, 3));
filterOrderRequest.setDealStatuses(Arrays.asList(1, 2, 3, 4));
break;
case Constant.ORDER_STATUS_WAIT_AUDITED:

109
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.service.sync;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONArray;
@ -34,10 +35,7 @@ import com.glxp.api.req.sync.SpsSyncDataRequest;
import com.glxp.api.res.inv.InnerOrderPrintResponse;
import com.glxp.api.res.sync.*;
import com.glxp.api.service.auth.*;
import com.glxp.api.service.basic.EntrustReceService;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.IBasicBusTypePreService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.inout.*;
import com.glxp.api.service.system.*;
import com.glxp.api.service.thrsys.*;
@ -1405,6 +1403,9 @@ public class HeartService {
}
}
@Resource
UdiProductService udiProductService;
// 下载最近更新国家库数据-上级服务
@Transactional(propagation = Propagation.NESTED)
public void dlAllDiProducts() {
@ -1447,11 +1448,109 @@ public class HeartService {
batchSession.commit();
remark.append("公司信息：").append(spSyncUdiResponse.getUdiCompanyEntities().size()).append("条\n");
}
if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())) {
List<ProductInfoEntity> productInfoEntities = spSyncUdiResponse.getProductInfoEntityList();
ProductInfoDao mapper = batchSession.getMapper(ProductInfoDao.class);
for (ProductInfoEntity productInfoEntity : productInfoEntities) {
try {
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(productInfoEntity.getNameCode());
//更新物资字典基础信息
if (StrUtil.isNotEmpty(productInfoEntity.getPackRatio()))
udiProductEntity.setPackRatio(productInfoEntity.getPackRatio());
if (StrUtil.isNotEmpty(productInfoEntity.getPackLevel()))
udiProductEntity.setPackLevel(productInfoEntity.getPackLevel());
if (productInfoEntity.getBhxjsl() != null)
udiProductEntity.setBhxjsl(productInfoEntity.getBhxjsl());
if (productInfoEntity.getBhzxxsbzsl() != null)
udiProductEntity.setBhzxxsbzsl(productInfoEntity.getBhzxxsbzsl());
if (productInfoEntity.getZxxsbzbhsydysl() != null)
udiProductEntity.setZxxsbzbhsydysl(productInfoEntity.getZxxsbzbhsydysl());
if (StrUtil.isNotEmpty(productInfoEntity.getBhxjcpbm()))
udiProductEntity.setBhxjcpbm(productInfoEntity.getBhxjcpbm());
if (StrUtil.isNotEmpty(productInfoEntity.getSjcpbm()))
udiProductEntity.setSjcpbm(productInfoEntity.getSjcpbm());
if (StrUtil.isNotEmpty(productInfoEntity.getBzcj()))
udiProductEntity.setBzcj(productInfoEntity.getBzcj());
if (StrUtil.isNotEmpty(productInfoEntity.getCpmctymc()))
udiProductEntity.setCpmctymc(productInfoEntity.getCpmctymc());
if (StrUtil.isNotEmpty(productInfoEntity.getCplb()))
udiProductEntity.setCplb(productInfoEntity.getCplb());
if (StrUtil.isNotEmpty(productInfoEntity.getFlbm()))
udiProductEntity.setFlbm(productInfoEntity.getFlbm());
if (StrUtil.isNotEmpty(productInfoEntity.getGgxh()))
udiProductEntity.setGgxh(productInfoEntity.getGgxh());
if (StrUtil.isNotEmpty(productInfoEntity.getQxlb()))
udiProductEntity.setQxlb(productInfoEntity.getQxlb());
if (StrUtil.isNotEmpty(productInfoEntity.getTyshxydm()))
udiProductEntity.setTyshxydm(productInfoEntity.getTyshxydm());
if (StrUtil.isNotEmpty(productInfoEntity.getYlqxzcrbarmc()))
udiProductEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
if (StrUtil.isNotEmpty(productInfoEntity.getYlqxzcrbarywmc()))
udiProductEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc());
if (StrUtil.isNotEmpty(productInfoEntity.getSydycpbs()))
udiProductEntity.setSydycpbs(productInfoEntity.getSydycpbs());
if (productInfoEntity.getVersionNumber() != null)
udiProductEntity.setVersionNumber(productInfoEntity.getVersionNumber());
if (StrUtil.isNotEmpty(productInfoEntity.getScbssfbhph())) {
udiProductEntity.setScbssfbhph(productInfoEntity.getScbssfbhph());
if (productInfoEntity.getScbssfbhph().equals("是")) {
udiProductEntity.setAllowNoBatch(false);
} else {
udiProductEntity.setAllowNoBatch(true);
}
}
if (StrUtil.isNotEmpty(productInfoEntity.getScbssfbhscrq())) {
udiProductEntity.setScbssfbhscrq(productInfoEntity.getScbssfbhscrq());
if (productInfoEntity.getScbssfbhscrq().equals("是")) {
udiProductEntity.setAllowNoProduct(false);
} else {
udiProductEntity.setAllowNoProduct(true);
}
}
if (StrUtil.isNotEmpty(productInfoEntity.getScbssfbhsxrq())) {
udiProductEntity.setScbssfbhsxrq(productInfoEntity.getScbssfbhsxrq());
if (productInfoEntity.getScbssfbhsxrq().equals("是")) {
udiProductEntity.setAllowNoExpire(false);
} else {
udiProductEntity.setAllowNoExpire(true);
}
}
if (StrUtil.isNotEmpty(productInfoEntity.getScbssfbhxlh())) {
udiProductEntity.setScbssfbhxlh(productInfoEntity.getScbssfbhxlh());
if (productInfoEntity.getScbssfbhxlh().equals("是")) {
udiProductEntity.setAllowNoSerial(false);
} else {
udiProductEntity.setAllowNoSerial(true);
}
}
if (StrUtil.isNotEmpty(productInfoEntity.getYbbm()))
udiProductEntity.setYbbm(productInfoEntity.getYbbm());
if (StrUtil.isNotEmpty(productInfoEntity.getCplx()))
udiProductEntity.setCplx(productInfoEntity.getCplx());
if (StrUtil.isNotEmpty(productInfoEntity.getHchzsb()))
udiProductEntity.setHchzsb(productInfoEntity.getHchzsb());
if (StrUtil.isNotEmpty(productInfoEntity.getSfwblztlcp()))
udiProductEntity.setSfwblztlcp(productInfoEntity.getSfwblztlcp());
if (StrUtil.isNotEmpty(productInfoEntity.getCgzmraqxgxx()))
udiProductEntity.setCgzmraqxgxx(productInfoEntity.getCgzmraqxgxx());
if (StrUtil.isNotEmpty(productInfoEntity.getSfbjwycxsy()))
udiProductEntity.setSfbjwycxsy(productInfoEntity.getSfbjwycxsy());
if (productInfoEntity.getZdcfsycs() != null)
udiProductEntity.setZdcfsycs(productInfoEntity.getZdcfsycs());
if (StrUtil.isNotEmpty(productInfoEntity.getSfwwjbz()))
udiProductEntity.setSfwwjbz(productInfoEntity.getSfwwjbz());
if (StrUtil.isNotEmpty(productInfoEntity.getSyqsfxyjxmj()))
udiProductEntity.setSyqsfxyjxmj(productInfoEntity.getSyqsfxyjxmj());
if (StrUtil.isNotEmpty(productInfoEntity.getMjfs()))
udiProductEntity.setMjfs(productInfoEntity.getMjfs());
if (StrUtil.isNotEmpty(productInfoEntity.getCategoryName()))
udiProductEntity.setCategoryName(productInfoEntity.getCategoryName());
udiProductService.updateUdiInfoById(udiProductEntity);
} catch (Exception e) {
e.printStackTrace();
log.error(ExceptionUtil.getMessage(e));
}
mapper.insertProductInfo(productInfoEntity);
}
batchSession.commit();

2
src/main/java/com/glxp/api/task/SyncThirdSysTask.java
Unescape Escape View File

@ -64,8 +64,6 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);
@Resource
protected ScheduledDao scheduledDao;
@Resource
private SyncDataSetDao syncDataSetDao;
@Override
public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {

33
src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
Unescape Escape View File

@ -112,6 +112,38 @@
group by auth_warehouse.id
</select>
<select id="filterGroupBySpuse" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse
INNER JOIN
auth_dept
on auth_warehouse.parentId = auth_dept.code
<if test="userId != '' and userId != null">
INNER JOIN auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
</if>
<where>
<if test="userId != '' and userId != null">
AND auth_warehouse_user.userId = #{userId}
</if>
<if test="deptCode != '' and deptCode != null">
AND auth_warehouse.parentId = #{deptCode}
</if>
<if test="pcode != '' and pcode != null">
AND auth_dept.code = #{pcode}
</if>
<if test="warehouseCode != '' and warehouseCode != null">
AND auth_dept.code &lt;&gt; #{warehouseCode}
</if>
<if test="advanceType != null">
AND auth_warehouse.advanceType = #{advanceType}
</if>
<if test="spUse != '' and spUse != null">
AND auth_warehouse.spUse = #{spUse}
</if>
</where>
group by auth_warehouse.id
</select>
<select id="filterGroupInvSubAndcode" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
select auth_warehouse.*
@ -168,7 +200,6 @@
</insert>
<delete id="deleteByParentCode" parameterType="Map">
DELETE
FROM auth_warehouse

16
src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
Unescape Escape View File

@ -423,7 +423,8 @@
versionNumber
, diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, cplx, hchzsb
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs)
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs,
categoryName)
values (#{id},
#{nameCode},
#{packRatio},
@ -471,7 +472,7 @@
#{sfwwjbz},
#{syqsfxyjxmj},
#{qtxxdwzlj},
#{mjfs})
#{mjfs}，#{categoryName})
</insert>
@ -485,7 +486,8 @@
versionNumber
, diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, cplx, hchzsb
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs) values
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs,
categoryName) values
<foreach collection="datas" item="item" index="index"
separator=",">
@ -528,7 +530,7 @@
#{item.isNewest},
#{item.updateTime}, #{item.cplx}, #{item.hchzsb}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx},
#{item.sfbjwycxsy}, #{item.zdcfsycs}
, #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.qtxxdwzlj}, #{item.mjfs})
, #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.qtxxdwzlj}, #{item.mjfs}, #{item.categoryName})
</foreach>
</insert>
@ -660,6 +662,9 @@
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</set>
WHERE id = #{id}
</update>
@ -730,6 +735,9 @@
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</set>
WHERE uuid = #{uuid}
</update>

151
src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
Unescape Escape View File

@ -84,6 +84,14 @@
basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.cplx,
basic_products.hchzsb
FROM (company_product_relevance
@ -155,6 +163,14 @@
WHERE (uuid = #{uuid})
</select>
<select id="findByOriginUuid" parameterType="java.lang.String"
resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT *
FROM basic_products
WHERE (originUuid = #{originUuid})
</select>
<select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT *
@ -162,7 +178,7 @@
WHERE (nameCode = #{nameCode})
limit 1
</select>
<insert id="insertUdiInfo" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
replace
INTO basic_products
(id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
@ -172,7 +188,9 @@
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8,pinyinInitial)
basicPrductRemak8
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryNamem,
pinyinInitial)
values (#{id}, #{uuid},
#{originUuid},
#{nameCode},
@ -223,11 +241,12 @@
#{basicPrductRemak5},
#{basicPrductRemak6},
#{basicPrductRemak7},
#{basicPrductRemak8},
#{pinyinInitial})
#{basicPrductRemak8}, #{updateTime}
, #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
#{categoryName}, #{pinyinInitial})
</insert>
<insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
<insert id="insertUdiInfos" parameterType="java.util.List">
replace INTO basic_products
(id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
@ -236,7 +255,8 @@
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8,pinyinInitial)
basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
mjfs, categoryName, pinyinInitial)
values
<foreach collection="udiInfoEntities" item="item" index="index"
@ -292,8 +312,10 @@
#{item.basicPrductRemak5},
#{item.basicPrductRemak6},
#{item.basicPrductRemak7},
#{item.basicPrductRemak8},
#{pinyinInitial})
#{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
#{item.zdcfsycs},
#{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
#{item.categoryName}, #{item.pinyinInitial})
</foreach>
</insert>
@ -426,8 +448,6 @@
<if test="allowNoSerial != null">
allowNoSerial=#{allowNoSerial},
</if>
<if test="spmc != null">
spmc=#{spmc},
</if>
@ -467,6 +487,31 @@
<if test="basicPrductRemak8 != null">
basicPrductRemak8=#{basicPrductRemak8},
</if>
<if test="sfwblztlcp != null">
sfwblztlcp=#{sfwblztlcp},
</if>
<if test="cgzmraqxgxx != null">
cgzmraqxgxx=#{cgzmraqxgxx},
</if>
<if test="sfbjwycxsy != null">
sfbjwycxsy=#{sfbjwycxsy},
</if>
<if test="zdcfsycs != null">
zdcfsycs=#{zdcfsycs},
</if>
<if test="sfwwjbz != null">
sfwwjbz=#{sfwwjbz},
</if>
<if test="syqsfxyjxmj != null">
syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</trim>
WHERE nameCode = #{nameCode}
and uuid = #{uuid}
@ -628,6 +673,34 @@
<if test="basicPrductRemak8 != null">
basicPrductRemak8=#{basicPrductRemak8},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="sfwblztlcp != null">
sfwblztlcp=#{sfwblztlcp},
</if>
<if test="cgzmraqxgxx != null">
cgzmraqxgxx=#{cgzmraqxgxx},
</if>
<if test="sfbjwycxsy != null">
sfbjwycxsy=#{sfbjwycxsy},
</if>
<if test="zdcfsycs != null">
zdcfsycs=#{zdcfsycs},
</if>
<if test="sfwwjbz != null">
sfwwjbz=#{sfwwjbz},
</if>
<if test="syqsfxyjxmj != null">
syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</trim>
where uuid = #{uuid}
</update>
@ -788,6 +861,36 @@
<if test="basicPrductRemak8 != null">
basicPrductRemak8=#{basicPrductRemak8},
</if>
<if test="updateTime != null">
updateTime=#{updateTime},
</if>
<if test="pinyinInitial != null">
pinyinInitial=#{pinyinInitial},
</if>
<if test="sfwblztlcp != null">
sfwblztlcp=#{sfwblztlcp},
</if>
<if test="cgzmraqxgxx != null">
cgzmraqxgxx=#{cgzmraqxgxx},
</if>
<if test="sfbjwycxsy != null">
sfbjwycxsy=#{sfbjwycxsy},
</if>
<if test="zdcfsycs != null">
zdcfsycs=#{zdcfsycs},
</if>
<if test="sfwwjbz != null">
sfwwjbz=#{sfwwjbz},
</if>
<if test="syqsfxyjxmj != null">
syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</trim>
where id = #{id}
</update>
@ -953,6 +1056,33 @@
<if test="basicPrductRemak8 != null">
basicPrductRemak8=#{basicPrductRemak8},
</if>
<if test="pinyinInitial != null">
pinyinInitial=#{pinyinInitial},
</if>
<if test="sfwblztlcp != null">
sfwblztlcp=#{sfwblztlcp},
</if>
<if test="cgzmraqxgxx != null">
cgzmraqxgxx=#{cgzmraqxgxx},
</if>
<if test="sfbjwycxsy != null">
sfbjwycxsy=#{sfbjwycxsy},
</if>
<if test="zdcfsycs != null">
zdcfsycs=#{zdcfsycs},
</if>
<if test="sfwwjbz != null">
sfwwjbz=#{sfwwjbz},
</if>
<if test="syqsfxyjxmj != null">
syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="mjfs != null">
mjfs=#{mjfs},
</if>
<if test="categoryName != null">
categoryName=#{categoryName},
</if>
</trim>
WHERE uuid = #{uuid}
</update>
@ -964,6 +1094,7 @@
limit 1
</select>
<select id="selectUdiByName" resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT b1.*,
b2.useMuti as useMuti,

69
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -178,6 +178,14 @@
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
company_product_relevance.unitFk,
basic_corp.erpId as customerId,
basic_corp.name companyName
@ -364,7 +372,15 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -722,7 +738,15 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -889,7 +913,16 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
from basic_udirel
INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
<where>
@ -1312,7 +1345,15 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
FROM basic_udirel
INNER JOIN basic_products
on basic_udirel.uuid = basic_products.uuid
@ -1423,6 +1464,14 @@
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
company_product_relevance.unitFk,
basic_corp.name companyName
FROM basic_udirel
@ -1510,7 +1559,6 @@
</select>
<select id="selectOneUdi" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
basic_products.originUuid,
@ -1562,7 +1610,15 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -1573,5 +1629,4 @@
</where>
limit 1
</select>
</mapper>

71
src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
Unescape Escape View File

@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.dao.purchase.PurApplyDetailDao">
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurApplyDetailRequest"
resultType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
select *
@ -18,21 +17,18 @@
AND supId = #{supId}
</if>
</where>
</select>
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurApplyDetailRequest"
resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
SELECT
pur_apply_detail.*,
SELECT pur_apply_detail.*,
basic_products.nameCode nameCode,
basic_products.ggxh spec,
basic_products.measname,
basic_products.manufactory,
basic_products.ylqxzcrbarmc,
basic_corp.`name` supName
FROM
pur_apply_detail
FROM pur_apply_detail
INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
@ -48,35 +44,31 @@
</if>
</where>
GROUP BY basic_products.uuid
order by pur_apply_detail.id desc
</select>
<insert id="insert" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
replace
INTO pur_apply_detail
(
orderIdFk,productId,productName,`count`,supId,zczbhhzbapzbh
)
values (
#{orderIdFk},
(orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh)
values (#{orderIdFk},
#{productId},
#{productName},
#{count},
#{supId},#{zczbhhzbapzbh}
)
#{supId}, #{zczbhhzbapzbh})
</insert>
<delete id="deleteByIds" parameterType="java.util.List">
DELETE FROM pur_apply_detail WHERE id in
DELETE
FROM pur_apply_detail WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<delete id="deleteByOrderId" parameterType="map">
DELETE
FROM pur_apply_detail
@ -87,44 +79,53 @@
<update id="update" parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
UPDATE pur_apply_detail
<trim prefix="set" suffixOverrides=",">
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
<if test="productId != null">productId=#{productId},</if>
<if test="productName != null">productName=#{productName},</if>
<if test="count != null">`count`=#{count},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
<if test="orderIdFk != null">
orderIdFk=#{orderIdFk},
</if>
<if test="productId != null">
productId=#{productId},
</if>
<if test="productName != null">
productName=#{productName},
</if>
<if test="count != null">
`count`=#{count},
</if>
<if test="supId != null">
supId=#{supId},
</if>
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh=#{zczbhhzbapzbh},
</if>
</trim>
WHERE id = #{id}
</update>
<insert id="insertPurApplyDetailEntity" keyProperty="id" parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
<insert id="insertPurApplyDetailEntity" keyProperty="id"
parameterType="com.glxp.api.entity.purchase.PurApplyDetailEntity">
REPLACE INTO pur_apply_detail
(orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
<foreach collection="datas" item="item" index="index" separator=",">
(
#{item.orderIdFk},
(#{item.orderIdFk},
#{item.productId},
#{item.productName},
#{item.count},
#{item.supId},
#{item.zczbhhzbapzbh}
)
#{item.zczbhhzbapzbh})
</foreach>
</insert>
<select id="selectPurApplyDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
SELECT
pur_apply_detail.*,
SELECT pur_apply_detail.*,
pur_apply.billNo,
basic_products.ggxh spec,
basic_products.measname,
basic_products.manufactory,
basic_products.ylqxzcrbarmc,
basic_corp.`name` supName
FROM
pur_apply_detail
FROM pur_apply_detail
INNER JOIN basic_udirel ON pur_apply_detail.productId = basic_udirel.id
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
left JOIN basic_corp ON pur_apply_detail.supId = basic_corp.erpId
@ -149,10 +150,14 @@
AND basic_products.manufactory like concat('%', #{manufactory}, '%')
</if>
<if test="startDate != null and startDate != ''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d')>= #{startDate}]]>
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') >= #{startDate}
]]>
</if>
<if test="endDate != null and endDate != ''">
<![CDATA[ and DATE_FORMAT(pur_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
<![CDATA[
and DATE_FORMAT(pur_apply.createTime, '%Y-%m-%d') <= #{endDate}
]]>
</if>
and pur_apply.status = 3
</where>

2
src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
Unescape Escape View File

@ -38,12 +38,14 @@
SELECT pur_order.*,
cb.employeeName createUserName,
ab.employeeName auditUserName,
db.employeeName applyCreateBy,
auth_warehouse.NAME invName,
auth_dept.`name` deptName,
basic_corp.name supName
FROM pur_order
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
LEFT JOIN auth_user db ON pur_order.applyCreateUser = db.id
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
left join basic_corp on pur_order.supId = basic_corp.erpId

11
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -492,3 +492,14 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(2
call Modify_index('basic_products','uuid','idx_uuid','BTREE');
CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'cgzmraqxgxx', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'sfbjwycxsy', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'zdcfsycs', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'sfwwjbz', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'syqsfxyjxmj', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'mjfs', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'categoryName', 'varchar(255)', 1);

Write Preview
Loading…
Cancel
Save