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

udims代码备份

Browse Source
master
anthonywj 3 years ago
parent 00160d2a5d
commit 5a97811af0
18 changed files with 139 additions and 86 deletions
Show Stats Download Patch File Download Diff File

17
api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java
Unescape Escape View File

@ -225,10 +225,10 @@ public class InoutUtils {
return detailCodeEntity;
}
public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) {
public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, WarehouseEntity warehouseEntity) {
String prefix;
prefix = FilterUdiUtils.getDiStr(code);
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix);
prefix = FilterUdiUtils.getDiStr(warehouseEntity.getCode());
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix, warehouseEntity.getCustomerId() + "");
if (udiInfoEntity == null) {
// udiInfoEntity = new UdiInfoEntity();
List<UdiInfoEntity> froms = new UdiDlHttpClient(udiUrl).getUdiByDi(prefix);
@ -251,14 +251,17 @@ public class InoutUtils {
udiInfoEntity = new UdiInfoEntity();
}
}
udiInfoEntity.setCode(code);
udiInfoEntity.setCode(warehouseEntity.getCode());
udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);
return udiInfoEntity;
}
public String vailIsUseDy(WarehousetempEntity warehouseEntity) {
UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, null, warehouseEntity.getCode());
public String vailIsUseDy(WarehousetempEntity warehousetempEntity) {
WarehouseEntity warehouseEntity1 = new WarehouseEntity();
warehouseEntity1.setCode(warehousetempEntity.getCode());
warehouseEntity1.setCustomerId(warehousetempEntity.getCustomerId());
UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, null, warehouseEntity1);
if (udiInfoEntity.getDiType() == Constant.DITYPE_SYDY) {
if (udiInfoEntity.getIsUseDy() != Constant.USEDY_TRUE) {
return "该产品未勾选以使用单元入库";
@ -274,7 +277,7 @@ public class InoutUtils {
if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity);
if (udiInfoEntity != null) {
if (warehouseEntity.getCount() != null)
udiInfoEntity.setCount(warehouseEntity.getCount());

2
api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java
Unescape Escape View File

@ -56,7 +56,7 @@ public class InvProductsController {
List<InvProductEntity> invProductEntities = invProductEntityPageResult.getList();
for (InvProductEntity invProductEntity : invProductEntities) {
UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(invProductEntity.getRelIdFk());
UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(invProductEntity.getRelIdFk(),invProductEntity.getCustomerId());
invProductEntity.setNameCode(udiInfoEntity.getNameCode());
invProductEntity.setProductsName(udiInfoEntity.getCpmctymc());
invProductEntity.setGgxh(udiInfoEntity.getGgxh());

4
api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java
Unescape Escape View File

@ -123,7 +123,7 @@ public class UdiRelevanceController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String ids = deleteRequest.getId();
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(ids);
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(ids, authAdmin.getCustomerId() + "");
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
for (int i = 0; i < udiInfoEntities.size(); i++) {
List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode(), authAdmin.getCustomerId());
@ -131,7 +131,7 @@ public class UdiRelevanceController {
return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
}
}
udiInfoService.deleteByUuid(ids);
udiInfoService.deleteByUuid(ids, authAdmin.getCustomerId() + "");
}
return ResultVOUtils.success("删除成功");
}

11
api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java
Unescape Escape View File

@ -72,7 +72,7 @@ public class UdiTraceController {
warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
// List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
String customerId = authAdmin.getCustomerId() + "";
List<WarehouseEntity> warehouseEntityList = warehouseMdService.filterWarehouse(warehouseQueryRequest);
if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
@ -80,7 +80,7 @@ public class UdiTraceController {
String udi = udiEntity.getUdi();
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(udi);
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi, customerId);
// List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
// {
// UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
@ -94,7 +94,7 @@ public class UdiTraceController {
// }).collect(Collectors.toList());
//查找父级或者子级
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid(), customerId);
List<UdiTraceResponse> udiTraceResponseList = new ArrayList<>();
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
@ -156,6 +156,7 @@ public class UdiTraceController {
AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
if (authAdmin.getCustomerId() != 110)
warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
String customerId = authAdmin.getCustomerId() + "";
if (warehouseQueryRequest.getCode() != null && !"".equals(warehouseQueryRequest.getCode())) {
if (warehouseQueryRequest.getFilterType() == null || warehouseQueryRequest.getFilterType() == 1) {
List<OrderMdEntity> temps = filterUdiTrace(warehouseQueryRequest);
@ -164,8 +165,8 @@ public class UdiTraceController {
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseQueryRequest.getCode());
if (udiEntity == null)
return ResultVOUtils.error(500, "UDI码格式错误！");
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi(), customerId);
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid(),customerId);
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
for (UdiInfoEntity temp : udiInfoEntities) {
WarehouseQueryRequest queryRequest = new WarehouseQueryRequest();

9
api-udims/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java
Unescape Escape View File

@ -14,11 +14,11 @@ public interface UdiInfoDao {
List<UdiInfoEntity> filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode);
UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode, @Param("customerId") String customerId);
UdiInfoEntity findByUuid(@Param("uuid") String uuid);
UdiInfoEntity findByUuid(@Param("uuid") String uuid, @Param("customerId") String customerId);
List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid);
List<UdiInfoEntity> findByUuids(@Param("uuid") String uuid, @Param("customerId") String customerId);
UdiInfoEntity selectById(@Param("id") String id);
@ -28,10 +28,11 @@ public interface UdiInfoDao {
boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByUuid(@Param("uuid") String uuid);
boolean deleteByUuid(@Param("uuid") String uuid, @Param("customerId") String customerId);
}

4
api-udims/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java
Unescape Escape View File

@ -15,5 +15,9 @@ public class InvProductDetailEntity {
private String action;
private Integer count;
private Date updateTime;
private String batchNo;
private String productionDate;
private String expireDate;
private String invProductIdFk;
}

7
api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductDetailMdService.java
Unescape Escape View File

@ -39,6 +39,9 @@ public class InvProductDetailMdService {
if (filterInvProductDetailRequest.getCustomerId() != null && !filterInvProductDetailRequest.getCustomerId().isEmpty()) {
query.addCriteria(Criteria.where("customerId").is(filterInvProductDetailRequest.getCustomerId()));
}
if (filterInvProductDetailRequest.getBatchNo() != null && !filterInvProductDetailRequest.getBatchNo().isEmpty()) {
query.addCriteria(Criteria.where("batchNo").is(filterInvProductDetailRequest.getBatchNo()));
}
return mongoPageHelper.pageQuery(query, InvProductDetailEntity.class,
filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getPage(),
filterInvProductDetailRequest.getLastId(), MongoDBName.NAME_INV_PRODUCT_DETAIL);
@ -60,7 +63,7 @@ public class InvProductDetailMdService {
public void updateInvProduct(InvProductDetailEntity invProductDetailEntity) {
Query query = new Query();
query.addCriteria(new Criteria().and("id").is(invProductDetailEntity.getId()));
query.addCriteria(new Criteria().and("_id").is(invProductDetailEntity.getId()));
Update update = new Update();
if (invProductDetailEntity.getCount() != null) {
@ -98,7 +101,7 @@ public class InvProductDetailMdService {
public void deleteByProductId(String productIdFk) {
Query query = new Query();
if (productIdFk != null) {
query.addCriteria(Criteria.where("productIdFk").is(productIdFk));
query.addCriteria(Criteria.where("invProductIdFk").is(productIdFk));
}
mongoTemplate.remove(query, InvProductDetailEntity.class, MongoDBName.NAME_INV_PRODUCT_DETAIL);
}

7
api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class InvProductMdService {
}
public InvProductEntity selectByUuid(String relIdFk, String batchNo) {
public InvProductEntity selectByUuid(String relIdFk, String batchNo, String customerId) {
Query query = new Query();
if (relIdFk != null && !relIdFk.isEmpty()) {
query.addCriteria(Criteria.where("relIdFk").is(relIdFk));
@ -46,6 +46,9 @@ public class InvProductMdService {
if (batchNo != null && !batchNo.isEmpty()) {
query.addCriteria(Criteria.where("batchNo").is(batchNo));
}
if (customerId != null && !customerId.isEmpty()) {
query.addCriteria(Criteria.where("customerId").is(customerId));
}
List<InvProductEntity> invProductEntities = mongoTemplate.find(query, InvProductEntity.class, MongoDBName.NAME_INV_PRODUCT);
if (invProductEntities != null && invProductEntities.size() > 0) {
return invProductEntities.get(0);
@ -72,7 +75,7 @@ public class InvProductMdService {
public void updateInvProduct(InvProductEntity invProductEntity) {
Query query = new Query();
query.addCriteria(new Criteria().and("id").is(invProductEntity.getId()));
query.addCriteria(new Criteria().and("_id").is(invProductEntity.getId()));
Update update = new Update();
if (invProductEntity.getInCount() != null) {

2
api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java
Unescape Escape View File

@ -57,7 +57,7 @@ public class OrderDetailMdService {
public void updateOrderDetail(ErpOrderEntity erpOrderEntity) {
Query query = new Query();
query.addCriteria(new Criteria().and("id").is(erpOrderEntity.getId()));
query.addCriteria(new Criteria().and("_id").is(erpOrderEntity.getId()));
Update update = new Update();
if (erpOrderEntity.getCount() != null) {

2
api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java
Unescape Escape View File

@ -133,7 +133,7 @@ public class OrderMdService {
if (orderMdEntity.getOrderId() != null && !orderMdEntity.getOrderId().isEmpty()) {
query.addCriteria(new Criteria().and("orderId").is(orderMdEntity.getOrderId()));
} else if (orderMdEntity.getId() != null && !orderMdEntity.getId().isEmpty()) {
query.addCriteria(new Criteria().and("id").is(orderMdEntity.getId()));
query.addCriteria(new Criteria().and("_id").is(orderMdEntity.getId()));
} else {
log.error("更新失败，未指定orderId");
return;

1
api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterInvProductDetailRequest.java
Unescape Escape View File

@ -11,6 +11,7 @@ public class FilterInvProductDetailRequest extends ListPageRequest {
private String productIdFk;
private String customerId;
private String mainAction;
private String batchNo;
private String action;
private Integer count;
private String lastId;

10
api-udims/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java
Unescape Escape View File

@ -14,13 +14,13 @@ public interface UdiInfoService {
List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findByNameCode(String nameCode);
UdiInfoEntity findByNameCode(String nameCode, String customerId);
UdiInfoEntity selectById(String nameCode);
UdiInfoEntity selectById(String nameCode, String customerId);
UdiInfoEntity findByUuid(String uuid);
UdiInfoEntity findByUuid(String uuid, String customerId);
List<UdiInfoEntity> findByUuids(String uuid);
List<UdiInfoEntity> findByUuids(String uuid, String customerId);
boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
@ -30,7 +30,7 @@ public interface UdiInfoService {
boolean deleteById(String id);
boolean deleteByUuid(String uuid);
boolean deleteByUuid(String uuid, String customerId);
boolean updateUdiInfoByUuid(UdiInfoEntity udiInfoEntity);

20
api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java
Unescape Escape View File

@ -23,7 +23,7 @@ public class UdiInfoServiceImpl implements UdiInfoService {
if (filterUdiInfoRequest == null) {
return Collections.emptyList();
}
if(filterUdiInfoRequest.getPage()!=null){
if (filterUdiInfoRequest.getPage() != null) {
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
}
@ -52,24 +52,24 @@ public class UdiInfoServiceImpl implements UdiInfoService {
}
@Override
public UdiInfoEntity findByNameCode(String nameCode) {
public UdiInfoEntity findByNameCode(String nameCode, String customerId) {
String prefix = FilterUdiUtils.getDiStr(nameCode);
return udiInfoDao.findByNameCode(prefix);
return udiInfoDao.findByNameCode(prefix,customerId);
}
@Override
public UdiInfoEntity selectById(String nameCode) {
public UdiInfoEntity selectById(String nameCode, String customerId) {
return udiInfoDao.selectById(nameCode);
}
@Override
public UdiInfoEntity findByUuid(String uuid) {
return udiInfoDao.findByUuid(uuid);
public UdiInfoEntity findByUuid(String uuid, String customerId) {
return udiInfoDao.findByUuid(uuid,customerId);
}
@Override
public List<UdiInfoEntity> findByUuids(String uuid) {
return udiInfoDao.findByUuids(uuid);
public List<UdiInfoEntity> findByUuids(String uuid, String customerId) {
return udiInfoDao.findByUuids(uuid,customerId);
}
@Override
@ -93,8 +93,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
}
@Override
public boolean deleteByUuid(String uuid) {
return udiInfoDao.deleteByUuid(uuid);
public boolean deleteByUuid(String uuid, String customerId) {
return udiInfoDao.deleteByUuid(uuid,customerId);
}
@Override

17
api-udims/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java
Unescape Escape View File

@ -38,6 +38,7 @@ public class InvProductsTrService {
orderFilterRequest.setId(orderId);
List<OrderMdEntity> orderMdEntities = orderService.findAll(orderFilterRequest);
OrderMdEntity orderEntity = orderMdEntities.get(0);
String customerId = orderEntity.getCustomerId() + "";
if (orderEntity.getStatus().equals("success")) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
@ -46,8 +47,8 @@ public class InvProductsTrService {
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
String nameCode = erpOrderEntity.getNameCode();
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode);
InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno());
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode, customerId);
InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno(), orderEntity.getCustomerId() + "");
if (invProductEntity == null) {
invProductEntity = new InvProductEntity();
invProductEntity.setRelIdFk(udiInfoEntity.getUuid());
@ -62,11 +63,13 @@ public class InvProductsTrService {
invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode());
if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
invProductEntity.setOutCount(erpOrderEntity.getCount());
invProductEntity.setInCount(0);
} else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) {
invProductEntity.setInCount(erpOrderEntity.getCount());
invProductEntity.setOutCount(0);
}
invProductService.insertInvProduct(invProductEntity);
invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo());
invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo(), orderEntity.getCustomerId() + "");
} else {
if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
invProductEntity.setOutCount(invProductEntity.getOutCount() + erpOrderEntity.getCount());
@ -81,17 +84,21 @@ public class InvProductsTrService {
if (warehouseEntities != null && warehouseEntities.size() > 0) {
for (WarehouseEntity warehouseEntity : warehouseEntities) {
UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi());
UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi(), customerId);
if (tempUdi.getUuid().equals(erpOrderEntity.getUuidFk())) {
if ((warehouseEntity.getBatchNo() == null && erpOrderEntity.getLotno() == null) ||
warehouseEntity.getBatchNo().equals(erpOrderEntity.getLotno())) {
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
invProductDetailEntity.setProductIdFk(invProductEntity.getId() + "");
invProductDetailEntity.setProductIdFk(invProductEntity.getRelIdFk() + "");
invProductDetailEntity.setInvProductIdFk(invProductEntity.getId());
invProductDetailEntity.setCode(warehouseEntity.getCode());
invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId());
invProductDetailEntity.setCount(warehouseEntity.getCount());
invProductDetailEntity.setAction(warehouseEntity.getAction());
invProductDetailEntity.setBatchNo(warehouseEntity.getBatchNo());
invProductDetailEntity.setMainAction(warehouseEntity.getMainAction());
invProductDetailEntity.setProductionDate(warehouseEntity.getProduceDate());
invProductDetailEntity.setExpireDate(warehouseEntity.getExpireDate());
invProductDetailEntity.setUpdateTime(new Date());
invProductDetailEntity.setCustomerId(orderEntity.getCustomerId() + "");
invProductDetailService.insertInvProduct(invProductDetailEntity);

2
api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java
Unescape Escape View File

@ -180,7 +180,7 @@ public class TransInoutService {
UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
if (udiEntity != null) {
String udi = udiEntity.getUdi();
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi, warehouseEntity.getCustomerId() + "");
if (udiInfoEntity != null && (udiInfoEntity.getDiType() == 4
|| (udiInfoEntity.getDiType() == 1 && udiInfoEntity.getIsUseDy() == 1))) {
CodeNeedRlEntity codeNeedRlEntity = new CodeNeedRlEntity();

2
api-udims/src/main/resources/application-pro.properties
Unescape Escape View File

@ -22,7 +22,7 @@ cors.allowed-Credentials=true
UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
#UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_Server
UCLOD_SERVER_URL=http://127.0.0.1:9997
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload
#同步库接口调用地址相关信息 https://www.udims.com/UDI_DL_Server_test
UDI_SERVER.url= http://localhost:9994

89
api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml
Unescape Escape View File

@ -53,31 +53,40 @@
</select>
<select id="findByUuid" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
SELECT * FROM io_productinfo WHERE (
uuid = #{uuid} and diType=1 ) limit 1
SELECT *
FROM io_productinfo
WHERE (
uuid = #{uuid} and diType = 1) limit 1
</select>
<select id="findByUuids" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
SELECT * FROM io_productinfo WHERE (
uuid = #{uuid} )
SELECT *
FROM io_productinfo
WHERE (
uuid = #{uuid})
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
SELECT * FROM io_productinfo WHERE (
id = #{id} ) limit 1
SELECT *
FROM io_productinfo
WHERE (
id = #{id}) limit 1
</select>
<select id="findByNameCode" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
SELECT * FROM io_productinfo WHERE (
nameCode = #{nameCode} ) limit 1
SELECT *
FROM io_productinfo
WHERE (
nameCode = #{nameCode}) limit 1
</select>
<insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
replace INTO io_productinfo
replace
INTO io_productinfo
(
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,isUseDy,
@ -86,32 +95,32 @@
)
values
(
#{nameCode},
#{packRatio},
#{packLevel},
#{bhxjsl},
#{bhzxxsbzsl},
#{zxxsbzbhsydysl},
#{bhxjcpbm},
#{bzcj},
#{addType},
#{deviceRecordKey},
#{isUseDy},
#{cpmctymc},
#{cplb},
#{flbm},
#{ggxh},
#{qxlb},
#{tyshxydm},
#{ylqxzcrbarmc},
#{zczbhhzbapzbh},
#{ylqxzcrbarywmc},
#{uuid},
#{sjcpbm},
#{versionNumber},
#{diType},
#{customerId}
)
#{nameCode},
#{packRatio},
#{packLevel},
#{bhxjsl},
#{bhzxxsbzsl},
#{zxxsbzbhsydysl},
#{bhxjcpbm},
#{bzcj},
#{addType},
#{deviceRecordKey},
#{isUseDy},
#{cpmctymc},
#{cplb},
#{flbm},
#{ggxh},
#{qxlb},
#{tyshxydm},
#{ylqxzcrbarmc},
#{zczbhhzbapzbh},
#{ylqxzcrbarywmc},
#{uuid},
#{sjcpbm},
#{versionNumber},
#{diType},
#{customerId}
)
</insert>
<insert id="insertUdiInfos" keyProperty="id" parameterType="java.util.List">
@ -157,11 +166,15 @@
</insert>
<delete id="deleteById" parameterType="Map">
DELETE FROM io_productinfo WHERE id = #{id}
DELETE
FROM io_productinfo
WHERE id = #{id}
</delete>
<delete id="deleteByUuid" parameterType="Map">
DELETE FROM io_productinfo WHERE uuid = #{uuid}
DELETE
FROM io_productinfo
WHERE uuid = #{uuid}
</delete>
<update id="updateUdiInfo" parameterType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
@ -189,6 +202,7 @@
<if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
<if test="versionNumber != null">versionNumber=#{versionNumber},</if>
<if test="diType != null">diType=#{diType},</if>
<if test="customerId != null">customerId=#{customerId},</if>
</set>
WHERE nameCode = #{nameCode}
</update>
@ -198,6 +212,7 @@
<set>
<if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
<if test="isUseDy != null">isUseDy=#{isUseDy},</if>
<if test="customerId != null">customerId=#{customerId},</if>
</set>
WHERE uuid = #{uuid}
</update>

19
api-udims/src/test/java/com/glxp/udi/admin/util/MongoDbTest.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.glxp.udi.admin.util;
import com.glxp.udi.BaseApiAdminApplicationTest;
import com.glxp.udi.admin.constant.TypeConstant;
import com.glxp.udi.admin.entity.inout.InvProductEntity;
import com.glxp.udi.admin.entity.inout.WarehouseEntity;
import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
import com.glxp.udi.admin.mongo.service.InvProductMdService;
import com.glxp.udi.admin.mongo.service.WarehouseMdService;
import com.glxp.udi.admin.mongo.service.WarehouseTempMdService;
import com.glxp.udi.admin.mongo.utils.PageResult;
@ -23,7 +26,8 @@ public class MongoDbTest extends BaseApiAdminApplicationTest {
private WarehouseTempMdService warehousetempService;
@Resource
private WarehouseMdService warehouseMdService;
@Resource
private InvProductMdService invProductService;
private static final Logger log = LoggerFactory.getLogger(MongoDbTest.class);
@ -87,6 +91,17 @@ public class MongoDbTest extends BaseApiAdminApplicationTest {
@Test
public void updateWarehouse() {
warehouseMdService.updateUnit("110","123456","厦门片仔癀");
warehouseMdService.updateUnit("110", "123456", "厦门片仔癀");
}
@Test
public void testUpDATE() {
InvProductEntity invProductEntity = new InvProductEntity();
invProductEntity.setInCount(44);
invProductEntity.setProductsName("-----11111");
invProductEntity.setId("620e0708f9c53f8a80d3166b");
invProductService.updateInvProduct(invProductEntity);
}
}

Write Preview
Loading…
Cancel
Save