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

码生成，基础信息bug

Browse Source
master
anthonywj 4 years ago
parent 213096bb36
commit e9e7ab8235
15 changed files with 172 additions and 91 deletions
Show Stats Download Patch File Download Diff File

2
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -167,7 +167,7 @@ public class UdiInfoController {
BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest); BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys()); filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys());
filterThrProductsRequest.setCode(null); // filterThrProductsRequest.setCode(null);
List<ThrProductsEntity> thrCorpEntities List<ThrProductsEntity> thrCorpEntities
= thrProductsService.filterThrProductsRequest(filterThrProductsRequest); = thrProductsService.filterThrProductsRequest(filterThrProductsRequest);

70
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
Unescape Escape View File

@ -255,13 +255,13 @@ public class UdiRelevanceController {
} }
} }
} }
removeProducts(combineRequest);
udiRelevanceEntity.setId(combineRequest.getRelId()); udiRelevanceEntity.setId(combineRequest.getRelId());
udiRelevanceEntity.setUuid(key); udiRelevanceEntity.setUuid(key);
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} else { } else {
udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(key); udiRelevanceEntity.setUuid(key);
@ -290,10 +290,25 @@ public class UdiRelevanceController {
udiRelevanceEntity.setId(combineRequest.getRelId()); udiRelevanceEntity.setId(combineRequest.getRelId());
udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
removeProducts(combineRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }
public void removeProducts(CombineRequest combineRequest) {
UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(combineRequest.getThirdId());
filterUdiInfoRequest.setUuid(temp.getUuid());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
UdiInfoEntity udiInfoEntity = udiInfoEntities.get(0);
if (udiInfoEntity.getDeviceRecordKey() == null)
udiInfoService.deleteById(udiInfoEntities.get(0).getId() + "");
}
}
//单独选入ERP产品 //单独选入ERP产品
@PostMapping("/udi/udirel/addErp") @PostMapping("/udi/udirel/addErp")
public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { public BaseResponse addErp(@RequestBody CombineRequest combineRequest) {
@ -309,29 +324,38 @@ public class UdiRelevanceController {
//一键选入ERP产品 //一键选入ERP产品
@PostMapping("/udi/udirel/addAllErp") @PostMapping("/udi/udirel/addAllErp")
public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) { public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
String url = basicThirdSysDetailEntity.getValue();
BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
if (basicThirdSysDetailEntity.getFromType() == 0) {
if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {//是否关联库存
basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), true);
} else {
basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), null);
}
} else {
if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) { if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), true); basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, true);
} else { } else {
basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), null); basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, null);
} }
}
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
// return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
// String url = basicThirdSysDetailEntity.getValue();
// BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
// if (basicThirdSysDetailEntity.getFromType() == 0) {
//
//
// if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {//是否关联库存
// basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), true);
// } else {
// basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), null);
// }
//
// } else {
//
// if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
// basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), true);
// } else {
// basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), null);
// }
//
// }
return ResultVOUtils.success("后台正在添加，请稍后刷新查看！"); return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
} }
@ -600,6 +624,9 @@ public class UdiRelevanceController {
udiRelevanceEntity.setThirdName4(""); udiRelevanceEntity.setThirdName4("");
} }
try { try {
CombineRequest combineRequest = new CombineRequest();
combineRequest.setRelId(removeRelRequest.getRelId());
removeProducts(combineRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -633,6 +660,7 @@ public class UdiRelevanceController {
return udiRelevanceEntity; return udiRelevanceEntity;
} }
public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) { public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) { for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {

74
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
Unescape Escape View File

@ -358,8 +358,8 @@ public class StockOrderController {
for (String id : stockOrderIdsRequest.getIds()) { for (String id : stockOrderIdsRequest.getIds()) {
stockOrderFilterRequest.setId(id); stockOrderFilterRequest.setId(id);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockPrintService.deleteByOrderId(stockOrderEntity.getId());
if (stockOrderEntity == null) continue; if (stockOrderEntity == null) continue;
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
stockOrderDetailFilterRequest.setLimit(100); stockOrderDetailFilterRequest.setLimit(100);
stockOrderDetailFilterRequest.setPage(1); stockOrderDetailFilterRequest.setPage(1);
@ -367,10 +367,6 @@ public class StockOrderController {
List<StockOrderDetailEntity> stockOrderDetailEntityList = List<StockOrderDetailEntity> stockOrderDetailEntityList =
stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
// Date date = new Date();
// String dateStr = simpleDateFormat.format(date);
List<StockPrintEntity> stockPrintEntities = new ArrayList<>(); List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
if (stockOrderIdsRequest.isFilterUDIType()) { if (stockOrderIdsRequest.isFilterUDIType()) {
@ -380,50 +376,22 @@ public class StockOrderController {
StockPrintEntity stockPrintEntity = new StockPrintEntity(); StockPrintEntity stockPrintEntity = new StockPrintEntity();
BeanUtils.copyProperties(udiInfoEntity, stockPrintEntity); BeanUtils.copyProperties(udiInfoEntity, stockPrintEntity);
stockPrintEntity.setSOrderId(stockOrderEntity.getId()); stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntities.add(stockPrintEntity); stockPrintEntities.add(stockPrintEntity);
} }
} }
// Map<String, Object> reqMap = new HashMap<>();
// reqMap.put("thirdSys", stockOrderEntity.getThirdSysFk());
// reqMap.put("nameCode", stockOrderDetailEntity.getProductId());
//
// String response = HttpClient.uCloudPost(stpUrl, reqMap);
// BaseResponse baseResponse =
// JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
// });
//
// //http://139.159.187.130:8080/UDI_WMS_MC/udiwms/stockPrint/getFilter?genKey=61224093960&page=1&limit=10
// StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
// stockQRCodeTextEntity.setOrderId(id);
// stockQRCodeTextEntity.setDetailId(stockOrderDetailEntity.getId());
// stockQRCodeTextEntity.setStatus(101 + "");//生成完成
// stockQRCodeTextEntity.setText(String.valueOf(baseResponse.getData()));
// Date tDate = new Date();
// stockQRCodeTextEntity.setCreate_time(tDate);
// stockQRCodeTextEntity.setUpdate_time(tDate);
// stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
} }
PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest(); PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest();
postStockPrintRequest.setThirdSys(stockOrderEntity.getThirdSysFk()); postStockPrintRequest.setThirdSys(stockOrderEntity.getThirdSysFk());
postStockPrintRequest.setDatas(stockPrintEntities); postStockPrintRequest.setDatas(stockPrintEntities);
if (stockPrintEntities.size() > 0) { if (stockPrintEntities.size() > 0) {
String genKey = generateQRCodeText(postStockPrintRequest); generateQRCodeText(postStockPrintRequest);
System.out.print(genKey);
// StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
// stockQRCodeTextEntity.setOrderId(id);
//// stockQRCodeTextEntity.setDetailId(stockOrderDetailEntity.getId());
//// stockQRCodeTextEntity.setDetailId(String.valueOf(0));
// stockQRCodeTextEntity.setStatus(101 + "");//生成完成
// stockQRCodeTextEntity.setText(genKey);
// Date tDate = new Date();
// stockQRCodeTextEntity.setCreate_time(tDate);
// stockQRCodeTextEntity.setUpdate_time(tDate);
// stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
} }
} }
return ResultVOUtils.success("操作成功，生成中。"); return ResultVOUtils.success("操作成功，生成中。");
@ -433,19 +401,19 @@ public class StockOrderController {
String genKey = null; String genKey = null;
if (postStockPrintRequest != null) { if (postStockPrintRequest != null) {
InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); // InCodeLogEntity inCodeLogEntity = new InCodeLogEntity();
inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS); // inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS);
inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); // inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
if (postStockPrintRequest.getGenKey() == null) { // if (postStockPrintRequest.getGenKey() == null) {
genKey = CustomUtil.getId(); // genKey = CustomUtil.getId();
inCodeLogEntity.setGenKey(genKey); // inCodeLogEntity.setGenKey(genKey);
} else { // } else {
genKey = postStockPrintRequest.getGenKey(); // genKey = postStockPrintRequest.getGenKey();
inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey()); // inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey());
} // }
inCodeLogEntity.setStatus(IncodeStatus.PROCESS); // inCodeLogEntity.setStatus(IncodeStatus.PROCESS);
inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); // inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys());
inCodeLogService.insertInCodeLog(inCodeLogEntity); // inCodeLogService.insertInCodeLog(inCodeLogEntity);
List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas(); List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas();
if (stockPrintEntities != null && stockPrintEntities.size() > 0) { if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
@ -468,8 +436,8 @@ public class StockOrderController {
stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity); stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
} }
} }
inCodeLogEntity.setStatus(IncodeStatus.FINISH); // inCodeLogEntity.setStatus(IncodeStatus.FINISH);
inCodeLogService.updateInCodeLog(inCodeLogEntity); // inCodeLogService.updateInCodeLog(inCodeLogEntity);
} }
return genKey; return genKey;
} }

20
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java
Unescape Escape View File

@ -15,6 +15,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils; import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -51,6 +52,25 @@ public class InvPrintController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@GetMapping("/spms/stockPrint/filter")
public BaseResponse filterSp( FilterStockprintRequest stockprintRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
// String thirdSys = systemParamConfigService.selectValueByParamKey("incode_thirdSys_fromType");
// stockprintRequest.setThirdSysFk(thirdSys);
List<StockPrintEntity> stockPrintEntities
= stockPrintService.filterStockPrint(stockprintRequest);
PageInfo<StockPrintEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintEntities);
PageSimpleResponse<StockPrintEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockPrintEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("udiwms/stockprint/post") @PostMapping("udiwms/stockprint/post")
public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) {

2
api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvStockPrintDao.java
Unescape Escape View File

@ -23,8 +23,10 @@ public interface InvStockPrintDao {
boolean updateStockPrint(StockPrintEntity udiInfoEntity); boolean updateStockPrint(StockPrintEntity udiInfoEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
boolean deleteByGenKey(@Param("genKey") String genKey); boolean deleteByGenKey(@Param("genKey") String genKey);
boolean deleteByOrderId(@Param("sOrderId") String sOrderId);
boolean updatePrintStatus(@Param("ids") List<String> ids); boolean updatePrintStatus(@Param("ids") List<String> ids);

3
api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.sale.admin.entity.basic;
import lombok.Data; import lombok.Data;
import java.util.Date;
@Data @Data
public class StockPrintEntity { public class StockPrintEntity {
private int id; private int id;
@ -30,4 +32,5 @@ public class StockPrintEntity {
private String sOrderId; private String sOrderId;
private String sDetailId; private String sDetailId;
private Date updateTime;
} }

2
api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java
Unescape Escape View File

@ -17,4 +17,6 @@ public class FilterStockprintRequest extends ListPageRequest {
private String spaceCode; private String spaceCode;
private String thirdSysFk; private String thirdSysFk;
private String genKeyFk; private String genKeyFk;
private String sOrderId;
private String sDetailId;
} }

3
api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java
Unescape Escape View File

@ -24,8 +24,11 @@ public class UdiInfoServiceImpl implements UdiInfoService {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if(filterUdiInfoRequest.getPage()!=null){
int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
}
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest); List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
return data; return data;
} }

4
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.inventory;
import com.glxp.sale.admin.entity.basic.StockPrintEntity; import com.glxp.sale.admin.entity.basic.StockPrintEntity;
import com.glxp.sale.admin.req.basic.FilterStockprintRequest; import com.glxp.sale.admin.req.basic.FilterStockprintRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@ -23,6 +24,9 @@ public interface InvStockPrintService {
boolean deleteByGenKey(String genKey); boolean deleteByGenKey(String genKey);
boolean deleteByOrderId(String sOrderId);
boolean updatePrintStatus(List<String> ids); boolean updatePrintStatus(List<String> ids);
} }

5
api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java
Unescape Escape View File

@ -65,6 +65,11 @@ public class InvStockPrintServiceImpl implements InvStockPrintService {
return stockPrintDao.deleteByGenKey(genKey); return stockPrintDao.deleteByGenKey(genKey);
} }
@Override
public boolean deleteByOrderId(String sOrderId) {
return stockPrintDao.deleteByOrderId(sOrderId);
}
@Override @Override
public boolean updatePrintStatus(List<String> ids) { public boolean updatePrintStatus(List<String> ids) {
return stockPrintDao.updatePrintStatus(ids); return stockPrintDao.updatePrintStatus(ids);

25
api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsDlService.java
Unescape Escape View File

@ -24,10 +24,7 @@ import com.glxp.sale.admin.service.thrsys.ThrProductsExportLogService;
import com.glxp.sale.admin.service.thrsys.ThrProductsImportDetailService; import com.glxp.sale.admin.service.thrsys.ThrProductsImportDetailService;
import com.glxp.sale.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.sale.admin.service.thrsys.ThrProductsImportLogService;
import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.*;
import com.glxp.sale.admin.util.ExcelUtil;
import com.glxp.sale.admin.util.HttpClient;
import com.glxp.sale.admin.util.RedisUtil;
import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.res.BaseResponse;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
@ -294,7 +291,17 @@ public class ThrProductsDlService {
return thrProductsImportDetailEntity; return thrProductsImportDetailEntity;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());
thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities);
if (thrProductsImportDetailEntities != null && thrProductsImportDetailEntities.size() > 0) {
List<List<ThrProductsImportDetailEntity>> splits = CustomUtil.splitList(thrProductsImportDetailEntities, 100);
for(List<ThrProductsImportDetailEntity> temps :splits){
thrProductsImportDetailService.insertProductsDetailImports(temps);
}
}
// for (ThrProductsImportDetailEntity thrProductsImportDetailEntity : thrProductsImportDetailEntities) {
// thrProductsImportDetailService.insertProductsDetailImport(thrProductsImportDetailEntity);
// }
// thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities);
List<ThrProductsEntity> thrProductsEntities; List<ThrProductsEntity> thrProductsEntities;
thrProductsEntities = thrProductsImportDetailEntities.stream().map( thrProductsEntities = thrProductsImportDetailEntities.stream().map(
@ -305,7 +312,13 @@ public class ThrProductsDlService {
return thrProductsEntity; return thrProductsEntity;
} }
).collect(Collectors.toList()); ).collect(Collectors.toList());
thrProductsService.insertThrProductss(thrProductsEntities);
if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
List<List<ThrProductsEntity>> splits = CustomUtil.splitList(thrProductsEntities, 100);
for(List<ThrProductsEntity> temps :splits){
thrProductsService.insertThrProductss(temps);
}
}
thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrProductsImportLogEntity.setUpdateTime(new Date()); thrProductsImportLogEntity.setUpdateTime(new Date());
thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity);

22
api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.glxp.sale.admin.util; package com.glxp.sale.admin.util;
import java.util.Random; import java.util.*;
import java.util.UUID;
public class CustomUtil { public class CustomUtil {
@ -17,4 +16,23 @@ public class CustomUtil {
id = id+number; id = id+number;
return id.substring(4); return id.substring(4);
} }
public static <T> List<List<T>> splitList(List<T> list, int len) {
if (list == null || list.isEmpty() || len < 1) {
return Collections.emptyList();
}
List<List<T>> result = new ArrayList<>();
int size = list.size();
int count = (size + len - 1) / len;
for (int i = 0; i < count; i++) {
List<T> subList = list.subList(i * len, ((i + 1) * len > size ? size : len * (i + 1)));
result.add(subList);
}
return result;
}
} }

18
api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml
Unescape Escape View File

@ -7,7 +7,6 @@
resultType="com.glxp.sale.admin.entity.basic.StockPrintEntity"> resultType="com.glxp.sale.admin.entity.basic.StockPrintEntity">
SELECT * FROM inv_stockprint SELECT * FROM inv_stockprint
<where> <where>
<if test="nameCode != '' and nameCode != null"> <if test="nameCode != '' and nameCode != null">
AND nameCode = #{nameCode} AND nameCode = #{nameCode}
</if> </if>
@ -32,6 +31,12 @@
<if test="genKeyFk != '' and genKeyFk != null"> <if test="genKeyFk != '' and genKeyFk != null">
AND genKeyFk = #{genKeyFk} AND genKeyFk = #{genKeyFk}
</if> </if>
<if test="sDetailId != '' and sDetailId != null">
AND sDetailId = #{sDetailId}
</if>
<if test="sOrderId != '' and sOrderId != null">
AND sOrderId = #{sOrderId}
</if>
</where> </where>
@ -55,6 +60,7 @@
udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo,
produceDate,expireDate,serialNo,codeType,thirdId,thirdName, produceDate,expireDate,serialNo,codeType,thirdId,thirdName,
ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk
,sOrderId,sDetailId,updateTime
) )
values values
( (
@ -73,7 +79,7 @@
#{ylqxzcrbarmc}, #{ylqxzcrbarmc},
#{zczbhhzbapzbh}, #{zczbhhzbapzbh},
#{warehouseName}, #{warehouseName},
#{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk} #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk},#{sOrderId},#{sDetailId},#{updateTime}
) )
</insert> </insert>
@ -83,6 +89,7 @@
udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo,
produceDate,expireDate,serialNo,codeType,thirdId,thirdName, produceDate,expireDate,serialNo,codeType,thirdId,thirdName,
ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk
,sOrderId,sDetailId,updateTime
) )
values values
@ -105,6 +112,7 @@
#{item.zczbhhzbapzbh}, #{item.zczbhhzbapzbh},
#{item.warehouseName}, #{item.warehouseName},
#{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk},#{item.thirdSysFk} #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk},#{item.thirdSysFk}
,#{item.sOrderId},#{item.sDetailId},#{item.updateTime}
) )
</foreach> </foreach>
</insert> </insert>
@ -117,6 +125,10 @@
DELETE FROM inv_stockprint WHERE genKeyFk = #{genKey} DELETE FROM inv_stockprint WHERE genKeyFk = #{genKey}
</delete> </delete>
<delete id="deleteByOrderId" parameterType="Map">
DELETE FROM inv_stockprint WHERE sOrderId = #{sOrderId}
</delete>
<update id="updateStockPrint" parameterType="com.glxp.sale.admin.entity.basic.StockPrintEntity"> <update id="updateStockPrint" parameterType="com.glxp.sale.admin.entity.basic.StockPrintEntity">
UPDATE inv_stockprint UPDATE inv_stockprint
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
@ -140,6 +152,8 @@
<if test="spaceCode != null">spaceCode=#{spaceCode},</if> <if test="spaceCode != null">spaceCode=#{spaceCode},</if>
<if test="spaceName != null">spaceName=#{spaceName},</if> <if test="spaceName != null">spaceName=#{spaceName},</if>
<if test="genKeyFk != null">genKeyFk=#{genKeyFk},</if> <if test="genKeyFk != null">genKeyFk=#{genKeyFk},</if>
<if test="sOrderId != null">sOrderId=#{sOrderId},</if>
<if test="sDetailId != null">sDetailId=#{sDetailId},</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}

2
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
Unescape Escape View File

@ -54,7 +54,7 @@
#{registerNo}, #{registerNo},
#{manufactory}, #{manufactory},
#{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm}, #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm},
#{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms} #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms},
#{thirdSysFk},#{updateTime} #{thirdSysFk},#{updateTime}
) )
</insert> </insert>

5
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
Unescape Escape View File

@ -40,7 +40,7 @@
#{registerNo}, #{registerNo},
#{manufactory}, #{manufactory},
#{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm}, #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm},
#{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms} #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms},
#{thirdSysFk},#{updateTime},#{genKeyFk} #{thirdSysFk},#{updateTime},#{genKeyFk}
) )
</insert> </insert>
@ -73,7 +73,8 @@
DELETE FROM thr_products_import_detail WHERE genKeyFk = #{genKey} DELETE FROM thr_products_import_detail WHERE genKeyFk = #{genKey}
</delete> </delete>
<update id="updateProductsDetailImport" parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity"> <update id="updateProductsDetailImport"
parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity">
UPDATE thr_products_import_detail UPDATE thr_products_import_detail
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<if test="code != null">code=#{code},</if> <if test="code != null">code=#{code},</if>

Write Preview
Loading…
Cancel
Save