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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_unify
wangwei 12 months ago
parent 186ccd438a 9115551dfd
commit f0be935b0b
5 changed files with 319 additions and 303 deletions
Show Stats Download Patch File Download Diff File

37
src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
Unescape Escape View File

@ -77,9 +77,9 @@ public class SysWorkplaceQueueController extends BaseController {
String scanCode = request.getScanCode();
if (StrUtil.isNotEmpty(scanCode)){
if (StrUtil.isNotEmpty(scanCode)) {
UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
if (udi != null ) request.setNameCode(udi.getUdi());
if (udi != null) request.setNameCode(udi.getUdi());
}
request.setScanCode(null);
@ -94,9 +94,9 @@ public class SysWorkplaceQueueController extends BaseController {
@GetMapping("/udiwms/sysWorkplaceQueue/getQueueBindList")
public BaseResponse getQueueBindList(SysWorkplaceQueueRequest request) {
String scanCode = request.getScanCode();
if (StrUtil.isNotEmpty(scanCode)){
if (StrUtil.isNotEmpty(scanCode)) {
UdiEntity udi = FilterUdiUtils.getUdi(scanCode);
if (udi != null ) request.setNameCode(udi.getUdi());
if (udi != null) request.setNameCode(udi.getUdi());
}
request.setScanCode(null);
@ -112,7 +112,7 @@ public class SysWorkplaceQueueController extends BaseController {
@GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
if (list.size() == 0){
if (list.size() == 0) {
return ResultVOUtils.error("当前工位未绑定取货槽！");
}
SysWorkplaceQueueResponse sysWorkplaceQueueResponse = list.get(0);
@ -200,18 +200,18 @@ public class SysWorkplaceQueueController extends BaseController {
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/sysWorkplaceQueue/add/layer")
public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request){
sysWorkplaceQueueService.addLayer(request,getUserId());
public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request) {
sysWorkplaceQueueService.addLayer(request, getUserId());
return ResultVOUtils.success("增加成功");
}
@PostMapping("/udiwms/WorkplaceQueue/bind")
public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest){
public BaseResponse bind(@RequestBody SysWorkplaceQueueBindRequest sysWorkplaceQueueBindRequest) {
String relId = sysWorkplaceQueueBindRequest.getRelId();
List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
if (CollUtil.isNotEmpty(list)){
if (CollUtil.isNotEmpty(list)) {
return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
}
@ -232,14 +232,14 @@ public class SysWorkplaceQueueController extends BaseController {
* 根据货位槽号 获取 货位槽信息
*/
@PostMapping("/udiwms/sysWorkplaceQueue/getInfoByCode")
public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request){
public BaseResponse getInfoByCode(@RequestBody SysWorkplaceQueueRequest request) {
String code = request.getCode();
if (StrUtil.isEmpty(code)){
if (StrUtil.isEmpty(code)) {
return ResultVOUtils.error("货位槽码不能为空");
}
List<SysWorkplaceQueueResponse> list = sysWorkplaceQueueService.filterBindList(request);
if (CollUtil.isEmpty(list)){
if (CollUtil.isEmpty(list)) {
return ResultVOUtils.error("未找到该货位槽码的信息");
}
SysWorkplaceQueueResponse sysWorkplaceQueue = list.get(0);
@ -254,20 +254,21 @@ public class SysWorkplaceQueueController extends BaseController {
* 根据货位槽号 获取 货位槽信息
*/
@PostMapping("/udiwms/sysWorkplaceQueue/getProductByCode")
public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request){
public BaseResponse getProductByCode(@RequestBody SysWorkplaceQueueRequest request) {
String udiCode = request.getUdiCode();
if (StrUtil.isEmpty(udiCode)){
if (StrUtil.isEmpty(udiCode)) {
return ResultVOUtils.error("UDI码不能为空");
}
UdiProductEntity byNameCode = udiProductService.findByNameCode(udiCode);
if (byNameCode == null){
return ResultVOUtils.error("UDI码未能识别出对应产品");
if (byNameCode == null) {
return ResultVOUtils.error("无法识别该编码");
}
String relId = byNameCode.getRelId();
List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, relId));
if (CollUtil.isNotEmpty(list)){
if (CollUtil.isNotEmpty(list)) {
return ResultVOUtils.error("产品已绑定到货位槽码的信息,请先解绑");
}
@ -278,7 +279,7 @@ public class SysWorkplaceQueueController extends BaseController {
* 解除绑定
*/
@PostMapping("/udiwms/sysWorkplaceQueue/removeProduct")
public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request){
public BaseResponse removeProduct(@RequestBody SysWorkplaceQueueRequest request) {
sysWorkplaceQueueService.removeProduct(request);
return ResultVOUtils.success();
}

6
src/main/java/com/glxp/api/entity/system/SyncDataSetEntity.java
Unescape Escape View File

@ -75,16 +75,16 @@ public class SyncDataSetEntity {
private int deviceInfo; //设备信息管理
private int deviceCheck;//巡检管理
// private int deviceCheckDetail;//巡检设备具体信息
// private int deviceCheckDetail;//巡检设备具体信息
// private int deviceCheckDetailItem;//巡检设备项目表
private int deviceRepairApply;//报修管理
// private int deviceRepairDetail;//报修明细
// private int deviceRepairDetail;//报修明细
// private int deviceRepair;//维修单
private int deviceUpkeep;//保养单
private int produceBusiness;//生产企业 PRODUCE_BUSINESS_DATA
/**
* 设备任务
* 药品关联关系同步
*/
private int drugDataTask;

12
src/main/java/com/glxp/api/service/basic/UdiProductService.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.api.dao.basic.SupEvaluateDetailMapper;
import com.glxp.api.dao.basic.UdiProductDao;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.SupEvaluateDetailEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
import com.glxp.api.entity.thrsys.CodeRel;
@ -107,8 +108,15 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
}
public UdiProductEntity findByNameCode(String nameCode) {
String prefix = FilterUdiUtils.getDiStr(nameCode);
return udiProductDao.findByNameCode(prefix);
// String prefix = FilterUdiUtils.getDiStr(nameCode);
if (nameCode.length() > 13) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(nameCode);
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
}
}
return udiProductDao.findByNameCode(nameCode);
}
public UdiProductEntity findById(String id) {

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

@ -34,65 +34,65 @@
<select id="filterUdiInfo2" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
SELECT basic_products.id,
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
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,
company_product_relevance.customerId as unitFk
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
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,
company_product_relevance.customerId as unitFk
FROM (company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id)
inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id)
inner JOIN basic_products
ON basic_udirel.uuid = basic_products.uuid
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
@ -167,181 +167,182 @@
<select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT basic_products.*,basic_udirel.purType,basic_udirel.hcType,basic_udirel.id as relId
SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType, basic_udirel.id as relId
FROM basic_products
LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
WHERE (basic_products.nameCode = #{nameCode})
WHERE (basic_products.nameCode = #{nameCode} or basic_products.ybbm = #{nameCode})
limit 1
</select>
<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,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, updateTime
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
pinyinInitial,
updateUser,
createTime,
createUser,
catalogname1,
catalogname2,
catalogname3,
matrial,
destinyType,
productsType,prepnUnit,prepnSpec,storageCondition,transportCondition,indate,packMatrial,majorType,majorStatus,physicType,medicareType,bzgg,
INTO basic_products
(id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, updateTime
, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, mjfs, categoryName,
pinyinInitial,
updateUser,
createTime,
createUser,
catalogname1,
catalogname2,
catalogname3,
matrial,
destinyType,
productsType, prepnUnit, prepnSpec, storageCondition, transportCondition, indate, packMatrial, majorType,
majorStatus, physicType, medicareType, bzgg,
requireScanCode)
values (#{id}, #{uuid},
#{originUuid},
#{nameCode},
#{deviceRecordKey},
#{packRatio},
#{packLevel},
#{packUnit},
#{bhxjsl},
#{bhzxxsbzsl },
#{zxxsbzbhsydysl},
#{bhxjcpbm},
#{bzcj},
#{cpmctymc},
#{cplb},
#{flbm},
#{ggxh},
#{qxlb},
#{tyshxydm},
#{ylqxzcrbarmc},
#{zczbhhzbapzbh},
#{ylqxzcrbarywmc},
#{sydycpbs},
#{sjcpbm},
#{versionNumber},
#{diType},
#{ybbm},
#{sptm},
#{manufactory},
#{measname},
#{productType},
#{scbssfbhph},
#{scbssfbhxlh},
#{scbssfbhscrq},
#{scbssfbhsxrq},
#{cpms},
#{allowNoBatch},
#{allowNoExpire},
#{allowNoProduct}, #{allowNoSerial},
#{spmc},
#{cplx},
#{hchzsb},
#{cpdls},
#{price},
#{basicPrductRemak1},
#{basicPrductRemak2},
#{basicPrductRemak3},
#{basicPrductRemak4},
#{basicPrductRemak5},
#{basicPrductRemak6},
#{basicPrductRemak7},
#{basicPrductRemak8}, #{updateTime}
, #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
#{categoryName}, #{pinyinInitial},
#{updateUser},
#{createTime},
#{createUser},
#{originUuid},
#{nameCode},
#{deviceRecordKey},
#{packRatio},
#{packLevel},
#{packUnit},
#{bhxjsl},
#{bhzxxsbzsl },
#{zxxsbzbhsydysl},
#{bhxjcpbm},
#{bzcj},
#{cpmctymc},
#{cplb},
#{flbm},
#{ggxh},
#{qxlb},
#{tyshxydm},
#{ylqxzcrbarmc},
#{zczbhhzbapzbh},
#{ylqxzcrbarywmc},
#{sydycpbs},
#{sjcpbm},
#{versionNumber},
#{diType},
#{ybbm},
#{sptm},
#{manufactory},
#{measname},
#{productType},
#{scbssfbhph},
#{scbssfbhxlh},
#{scbssfbhscrq},
#{scbssfbhsxrq},
#{cpms},
#{allowNoBatch},
#{allowNoExpire},
#{allowNoProduct}, #{allowNoSerial},
#{spmc},
#{cplx},
#{hchzsb},
#{cpdls},
#{price},
#{basicPrductRemak1},
#{basicPrductRemak2},
#{basicPrductRemak3},
#{basicPrductRemak4},
#{basicPrductRemak5},
#{basicPrductRemak6},
#{basicPrductRemak7},
#{basicPrductRemak8}, #{updateTime}
, #{sfwblztlcp}, #{cgzmraqxgxx}, #{sfbjwycxsy}, #{zdcfsycs}, #{sfwwjbz}, #{syqsfxyjxmj}, #{mjfs},
#{categoryName}, #{pinyinInitial},
#{updateUser},
#{createTime},
#{createUser},
#{catalogname1},
#{catalogname2},
#{catalogname3},
#{matrial},
#{destinyType},
#{productsType},
#{prepnUnit},
#{prepnSpec},
#{storageCondition},
#{transportCondition},
#{indate},
#{packMatrial},
#{majorType},
#{majorStatus},
#{physicType},
#{medicareType},
#{bzgg},
#{productsType},
#{prepnUnit},
#{prepnSpec},
#{storageCondition},
#{transportCondition},
#{indate},
#{packMatrial},
#{majorType},
#{majorStatus},
#{physicType},
#{medicareType},
#{bzgg},
#{requireScanCode})
</insert>
<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,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
mjfs, categoryName, pinyinInitial)
values
(id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packLevel, packUnit, bhxjsl, bhzxxsbzsl,
zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm,
ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, diType, ybbm, sptm,
manufactory, measname, productType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq, cpms,
allowNoBatch, allowNoExpire,
allowNoProduct, allowNoSerial, spmc, cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2,
basicPrductRemak3, basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, updateTime, sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj,
mjfs, categoryName, pinyinInitial)
values
<foreach collection="udiInfoEntities" item="item" index="index"
separator=",">
(#{item.id},
#{item.uuid},
#{item.originUuid},
#{item.nameCode},
#{item.deviceRecordKey},
#{item.packRatio},
#{item.packLevel},
#{item.packUnit},
#{item.bhxjsl},
#{item.bhzxxsbzsl},
#{item.zxxsbzbhsydysl},
#{item.bhxjcpbm},
#{item.bzcj},
#{item.cpmctymc},
#{item.cplb},
#{item.flbm},
#{item.ggxh},
#{item.qxlb},
#{item.tyshxydm},
#{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh},
#{item.ylqxzcrbarywmc},
#{item.sydycpbs},
#{item.sjcpbm},
#{item.versionNumber},
#{item.diType},
#{item.ybbm},
#{item.sptm},
#{item.manufactory},
#{item.measname},
#{item.productType},
#{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq},
#{item.cpms},
#{item.allowNoBatch},
#{item.allowNoExpire},
#{item.allowNoProduct}, #{item.allowNoSerial},
#{item.spmc},
#{item.cplx},
#{item.hchzsb},
#{item.cpdls},
#{item.price},
#{item.basicPrductRemak1},
#{item.basicPrductRemak2},
#{item.basicPrductRemak3},
#{item.basicPrductRemak4},
#{item.basicPrductRemak5},
#{item.basicPrductRemak6},
#{item.basicPrductRemak7},
#{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
#{item.zdcfsycs},
#{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
#{item.categoryName}, #{item.pinyinInitial})
#{item.uuid},
#{item.originUuid},
#{item.nameCode},
#{item.deviceRecordKey},
#{item.packRatio},
#{item.packLevel},
#{item.packUnit},
#{item.bhxjsl},
#{item.bhzxxsbzsl},
#{item.zxxsbzbhsydysl},
#{item.bhxjcpbm},
#{item.bzcj},
#{item.cpmctymc},
#{item.cplb},
#{item.flbm},
#{item.ggxh},
#{item.qxlb},
#{item.tyshxydm},
#{item.ylqxzcrbarmc},
#{item.zczbhhzbapzbh},
#{item.ylqxzcrbarywmc},
#{item.sydycpbs},
#{item.sjcpbm},
#{item.versionNumber},
#{item.diType},
#{item.ybbm},
#{item.sptm},
#{item.manufactory},
#{item.measname},
#{item.productType},
#{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq},
#{item.cpms},
#{item.allowNoBatch},
#{item.allowNoExpire},
#{item.allowNoProduct}, #{item.allowNoSerial},
#{item.spmc},
#{item.cplx},
#{item.hchzsb},
#{item.cpdls},
#{item.price},
#{item.basicPrductRemak1},
#{item.basicPrductRemak2},
#{item.basicPrductRemak3},
#{item.basicPrductRemak4},
#{item.basicPrductRemak5},
#{item.basicPrductRemak6},
#{item.basicPrductRemak7},
#{item.basicPrductRemak8}, #{item.updateTime}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx}, #{item.sfbjwycxsy},
#{item.zdcfsycs},
#{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.mjfs},
#{item.categoryName}, #{item.pinyinInitial})
</foreach>
</insert>
@ -566,7 +567,7 @@
transportCondition=#{transportCondition},
</if>
<if test="indate != null">
indate=#{indate},
indate=#{indate},
</if>
<if test="useAttribute != null">
useAttribute=#{useAttribute},
@ -588,7 +589,7 @@
</if>
</trim>
WHERE nameCode = #{nameCode}
and uuid = #{uuid}
and uuid = #{uuid}
</update>
<update id="updateUdiInfoByUuid" parameterType="com.glxp.api.entity.basic.UdiProductEntity">
@ -1002,7 +1003,6 @@
<if test="matrial != null">
matrial=#{matrial},
</if>
</trim>
where id = #{id}
</update>
@ -1034,7 +1034,7 @@
<select id="selectGgxhList" resultType="java.lang.String">
select distinct ggxh
from basic_products
left join basic_udirel on basic_products.uuid = basic_udirel.uuid
left join basic_udirel on basic_products.uuid = basic_udirel.uuid
where basic_udirel.id = #{relId}
</select>
@ -1209,13 +1209,13 @@
<select id="selectUdiByName" resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT b1.*,
b2.useMuti as useMuti,
b2.useNum as useNum,
b2.id as relId,
c1.customerId as supId
b2.useMuti as useMuti,
b2.useNum as useNum,
b2.id as relId,
c1.customerId as supId
FROM basic_products b1
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
LEFT JOIN company_product_relevance c1 ON c1.udiRlIdFk = b2.id
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
LEFT JOIN company_product_relevance c1 ON c1.udiRlIdFk = b2.id
where nameCode = #{nameCode}
limit 1
</select>
@ -1224,64 +1224,64 @@
<select id="filterUdiInfoById" parameterType="string"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
SELECT basic_products.id,
basic_udirel.id as relId,
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
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,
company_product_relevance.customerId as unitFk
basic_udirel.id as relId,
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,
basic_products.cpms,
basic_products.originUuid,
basic_products.allowNoBatch,
basic_products.allowNoExpire,
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,
company_product_relevance.customerId as unitFk
FROM basic_udirel
left JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
left JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
<where>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
@ -1291,6 +1291,7 @@
</select>
<select id="selectListByUuid" resultType="com.glxp.api.entity.basic.UdiProductEntity">
select *
from basic_products where uuid = #{uuid}
from basic_products
where uuid = #{uuid}
</select>
</mapper>

6
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -4825,3 +4825,9 @@ CREATE TABLE IF NOT EXISTS `third_ali_drug`
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
CALL Pro_Temp_ColumnWork('sync_data_set', 'drugDataTask',
' tinyint NULL DEFAULT NULL COMMENT ''药品关联关系同步''',
1);

Write Preview
Loading…
Cancel
Save