自助平台搬UDI管理系统,

master
anthonyywj2 3 years ago
parent 379082c9aa
commit 8e7fc2d784

@ -65,6 +65,11 @@ public class ConstantStatus {
public static final int SORDER_FROM_ONLINE = 2; //在线实时拉取第三方业务单据
public static final int SORDER_FROM_CACHE = 0; //本地缓存第三方业务单据
public static final int SORDER_FROM_LOCAL = 1; //本地生成业务单据
//往来信息类型-单据
public static final int CORP_TYPE_INPUT = 2; //病人
public static final int CORP_TYPE_OUT = 0; //供应商
public static final int CORP_TYPE_INNOR = 1; //内部科室等
//往来单位类型
@ -86,6 +91,7 @@ public class ConstantStatus {
public static final int FROM_PC = 5; //pc端扫码精灵
public static final int FROM_CHANGE = 6; //单据流转
public static final int FROM_UDISP = 7; //供应商平台
public static final int FROM_PEACE_CHANGE = 8; //平衡补单
//业务单据详情DI绑定供应商状态
@ -101,5 +107,10 @@ public class ConstantStatus {
public static final int DITYPE_PACK = 4; //包装标识
//
//流转单据类型
public static final int ORDER_CHANGE_NORMAL_IN = 1; //补采购入库
public static final int ORDER_CHANGE_NORMAL_ADV_IN = 2; //补寄售转入
public static final int ORDER_CHANGE_ADVANCE_IN = 3; //补寄售入库
public static final int ORDER_CHANGE_ADVANCE_OUT = 4; //补寄售出库
public static final int ORDER_CHANGE_INNOR_NORMAL_IN = 5; //补调拨入库
}

@ -230,5 +230,16 @@ public class AuthAdminController {
return ResultVOUtils.success();
}
/**
*
*
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/admin/auth/admin/hospitalUserList")
public BaseResponse getHospitalUserList() {
return ResultVOUtils.success(authAdminService.getHospitalUserList());
}
}

@ -1,5 +1,7 @@
package com.glxp.api.admin.controller.basic;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
@ -41,7 +43,7 @@ public class BussinessChangeTypeController {
List<BussinessChangeTypeEntity> bussinessTypeEntities;
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
if (bussinessLocalTypeEntity == null) {
return ResultVOUtils.error(500, "业务单据类型错误");
return ResultVOUtils.error(499, "该业务类型未绑定扫码单据类型!");
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction());
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
@ -51,20 +53,61 @@ public class BussinessChangeTypeController {
if (bussinessTypeFilterRequest.getType() != null
&& "changeEnable".equals(bussinessTypeFilterRequest.getType())
) {
if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction())) {
// if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
// BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
// bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\"");
// bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_OUT);
// bussinessChangeTypeEntity1.setIndex(1);
// bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
// bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
// bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
// } else
if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\"");
bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
bussinessChangeTypeEntity2.setIndex(1);
bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);
BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\"");
bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN);
bussinessChangeTypeEntity3.setIndex(2);
bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3);
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
} else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"采购入库单\"");
bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\"");
bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN);
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
}
}
}
return ResultVOUtils.success(bussinessTypeEntities);
}
@AuthRuleAnnotation("")
@PostMapping("/spms/bussinessChangeType/remove")
public BaseResponse removeBussinessType(@RequestBody BussinessChangeTypeEntity deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String action = deleteRequest.getScAction();
bussinessChangeTypeService.deleteByAction(action);
return ResultVOUtils.success("删除成功");
}
@PostMapping("/spms/bussinessChangeType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -1,9 +1,14 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.req.basic.BusNoUserRequest;
import com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.api.admin.req.business.StockOrderFilterRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
@ -24,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
@ -58,6 +64,42 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterJoinByUser")
public BaseResponse filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessLocalTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessLocalTypeService.filterJoinByUser(
bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterByBus")
public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
return ResultVOUtils.success(bussinessTypeEntity.getLocalAction());
}
@GetMapping("/udiwms/localBusType/filter")
public BaseResponse filterBussinessType(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
@ -66,13 +108,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessLocalTypeEntity> bussinessTypeEntities = null;
// if (bussinessTypeFilterRequest.getIsFilterBind()) {
// bussinessTypeEntities = bussinessLocalTypeService.filterUnBind(bussinessTypeFilterRequest);
// } else {
bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
// }
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -81,6 +117,30 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/localBusType/filterUnUse")
public BaseResponse filterUnUse(BusNoUserRequest busNoUserRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessTypeFilterRequest.setEnabled(true);
List<BussinessLocalTypeEntity> bussinessTypeEntities;
List<BussinessLocalTypeEntity> returnDatas = new ArrayList<>();
bussinessTypeEntities = bussinessLocalTypeService.filterLeftJoin(bussinessTypeFilterRequest);
for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessTypeEntities) {
if (StrUtil.isEmpty(bussinessLocalTypeEntity.getAction()) || bussinessLocalTypeEntity.getLocalAction().equals(busNoUserRequest.getCurAction())) {
returnDatas.add(bussinessLocalTypeEntity);
}
}
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setList(returnDatas);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/localBusType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -90,6 +150,7 @@ public class BussinessLocalTypeController {
}
String id = deleteRequest.getId();
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id);
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessTypeFilterRequest.setAction(bussinessLocalTypeEntity.getAction());
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest);
@ -108,6 +169,7 @@ public class BussinessLocalTypeController {
if (bussinessChangeTypeEntity != null && bussinessChangeTypeEntity.getScAction() != null) {
return ResultVOUtils.error(500, "该业务单据类型已绑定流转单据类型,无法删除!");
}
bussinessLocalTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}

@ -35,7 +35,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessOriginTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessOriginTypeService.filterList(
bussinessTypeEntities = bussinessOriginTypeService.filterEnableList(
bussinessTypeFilterRequest);
PageInfo<BussinessOriginTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);

@ -1,13 +1,18 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.BussinessTypeUtils;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.entity.basic.BusDataEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.CndidateRequest;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
@ -19,6 +24,8 @@ import com.glxp.api.admin.res.basic.BasicThirdSysResponse;
import com.glxp.api.admin.res.basic.BussinessTypExportResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.res.basic.SrBtResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.util.CustomUtil;
@ -49,7 +56,10 @@ import java.util.stream.Collectors;
@RestController
public class BussinessTypeController {
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
@ -62,6 +72,19 @@ public class BussinessTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
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<BussinessTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
PageInfo<BussinessTypeEntity> pageInfo;
@ -79,6 +102,18 @@ public class BussinessTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
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<BussinessTypResponse> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
PageInfo<BussinessTypResponse> pageInfo;
@ -89,6 +124,25 @@ public class BussinessTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/filterAllByUser")
public BaseResponse filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
PageInfo<BussinessTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(bussinessTypeEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
// @AuthRuleAnnotation("")
@GetMapping("/udiwms/bussinessType/download")
public BaseResponse downloadJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -238,5 +292,24 @@ public class BussinessTypeController {
// return ResultVOUtils.success("文件生成成功!!");
}
/**
*
*
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/warehouse/bussinessType/candidateBussinessType")
public BaseResponse candidateBussinessType(CndidateRequest cndidateRequest) {
if (StrUtil.isBlank(cndidateRequest.getMainAction())) {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.candidateBussinessType(cndidateRequest.getMainAction());
if (!StrUtil.isEmpty(cndidateRequest.getCurAction())) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(cndidateRequest.getCurAction());
bussinessTypeEntities.add(bussinessTypeEntity);
}
//查询补单单据类型
return ResultVOUtils.success(bussinessTypeEntities);
}
}

@ -3,6 +3,7 @@ package com.glxp.api.admin.controller.basic;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.*;
@ -224,6 +225,26 @@ public class UdiRelevanceController {
return ResultVOUtils.success("更新成功");
}
//新增或修改关联
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/check/udi")
public BaseResponse checkUdi(@RequestBody CombineRequest combineRequest) {
List<String> keys = combineRequest.getKeys();
if (keys != null && keys.size() > 0) {
List<UdiRelevanceEntity> datas = udiRelevanceService.batchSelectByUuid(keys);
if (datas.isEmpty()) {
return ResultVOUtils.success("无被选入!");
} else {
return ResultVOUtils.error(499, "所选产品DI已经被"+"第三方产品ID"+"绑定,您确定继续对照");
}
}
return ResultVOUtils.success("合并成功");
}
//新增或修改关联
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {

@ -2,8 +2,12 @@ package com.glxp.api.admin.controller.business;
import cn.hutool.core.bean.BeanUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inventory.InvPrintController;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
@ -21,6 +25,11 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.business.StockOrderExportResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.res.inout.StockOrderResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.business.StockOrderDetailService;
@ -30,8 +39,10 @@ import com.glxp.api.admin.service.business.StockQRCodeTextService;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inventory.InCodeLogService;
import com.glxp.api.admin.service.inventory.InvStockPrintService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.StockOrderBillNoUtils;
import com.glxp.api.common.enums.ResultEnum;
@ -67,7 +78,8 @@ public class StockOrderController {
private UdiRelevanceService udiRelevanceService;
@Resource
private SystemParamConfigService systemParamConfigService;
@Resource
private AuthAdminService authAdminService;
@Resource
private InvPrintController invPrintController;
@Resource
@ -76,6 +88,14 @@ public class StockOrderController {
InCodeLogService inCodeLogService;
@Resource
CompanyService companyService;
@Resource
BussinessLocalTypeService bussinessLocalTypeService;
@Resource
BasicUnitMaintainService basicUnitMaintainService;
@Resource
OrderService orderService;
@Resource
CustomerService customerService;
@GetMapping("/udiwms/stock/order/error")
public BaseResponse listStockOrderNoDealWith(StockOrderFilterRequest stockOrderFilterRequest) {
@ -117,11 +137,10 @@ public class StockOrderController {
@PostMapping("/udiwms/stock/order/insertWeb")
public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Integer userId = customerService.getUserId();
boolean noRepeatBillNo = false;
boolean newBillNo = false;
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
@ -145,7 +164,7 @@ public class StockOrderController {
StockOrderEntity stockOrderEntity = new StockOrderEntity();
BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
stockOrderEntity.setCreateUser(userId);
stockOrderEntity.setStatus(
StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交
: stockOrderEntity.getStatus());
@ -162,11 +181,22 @@ public class StockOrderController {
}
}
if (StringUtils.isBlank(stockOrderEntity.getId())) {
if (stockOrderPostRequest.getCorpId() == null) {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByName(stockOrderPostRequest.getCorpName());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType());
if (basicUnitMaintainEntity == null && bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
basicUnitMaintainEntity = new BasicUnitMaintainEntity();
basicUnitMaintainEntity.setErpId(CustomUtil.getUnitId());
stockOrderPostRequest.setCorpId(basicUnitMaintainEntity.getErpId());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SICK);
basicUnitMaintainEntity.setName(stockOrderPostRequest.getCorpName());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
}
stockOrderEntity.setCorpId(stockOrderPostRequest.getCorpId());
stockOrderEntity.setCorpName(stockOrderPostRequest.getCorpName());
stockOrderEntity.setUnitIdFk(stockOrderPostRequest.getUnitIdFk());
CompanyEntity companyEntity = companyService.findCompany();
// stockOrderEntity.setCorpId(companyEntity.getUnitIdFk());
// stockOrderEntity.setCorpName(companyEntity.getCompanyName());
// stockOrderEntity.setUnitIdFk(companyEntity.getUnitIdFk());
stockOrderEntity.setCustomerId(stockOrderPostRequest.getCustomerId());
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
b = stockOrderService.insertStockOrder(stockOrderEntity);
@ -238,18 +268,17 @@ public class StockOrderController {
// stockOrderFilterRequest.setStatus(0 + "");
// }
// if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) {
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
// stockOrderFilterRequest.setCorpId(null);
// }
stockOrderFilterRequest.setUserId(customerService.getUserId());
stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
PageInfo<StockOrderEntity> pageInfo;
pageInfo = new PageInfo<>(stockOrderEntityList);
PageSimpleResponse<StockOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
//判断订单是否可以补单
List<StockOrderResponse> resultList = orderService.checkSupplementOrder(stockOrderEntityList);
PageSimpleResponse<StockOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockOrderEntityList);
pageSimpleResponse.setList(resultList);
return ResultVOUtils.success(pageSimpleResponse);
}
@ -258,6 +287,7 @@ public class StockOrderController {
public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
@ -265,10 +295,6 @@ public class StockOrderController {
stockOrderFilterRequest.setBillType(stockOrderFilterRequest.getBillAction());
}
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
// if (stockOrderFilterRequest.getCustomerId() != null) {
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCustomerId()));
// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
// }
List<StockOrderEntity> stockOrderEntityList;
stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest);
@ -314,6 +340,13 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/update")
public BaseResponse submitStockOrder(@RequestBody StockOrderEntity stockOrderEntity) {
stockOrderService.updateById(stockOrderEntity);
return ResultVOUtils.success();
}
@GetMapping("/udiwms/stock/order/new/submit")
public BaseResponse submitNewStockOrder(@RequestParam("id") String id) {
StockOrderEntity stockOrderEntity = new StockOrderEntity();
@ -341,10 +374,19 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/qrcode/generate/text")
public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
if (stockOrderIdsRequest.getIds().size() < 1) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
if (stockOrderIdsRequest.getIds() == null || stockOrderIdsRequest.getIds().size() < 1) {
if (stockOrderIdsRequest.getId() != null) {
List<String> ids = new ArrayList<>();
ids.add(stockOrderIdsRequest.getId());
stockOrderIdsRequest.setIds(ids);
} else
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
for (String id : stockOrderIdsRequest.getIds()) {
stockOrderFilterRequest.setId(id);
@ -368,22 +410,27 @@ public class StockOrderController {
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode() + "");
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntities.add(stockPrintEntity);
}
} else {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode());
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntities.add(stockPrintEntity);
}
}
@ -446,6 +493,7 @@ public class StockOrderController {
return genKey;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/generateBillNo")
public BaseResponse stockOrderGenerateBillNo(@RequestParam("action") String action) {
@ -453,7 +501,6 @@ public class StockOrderController {
return ResultVOUtils.success(billNo);
}
/**
*
*

@ -1,24 +1,37 @@
package com.glxp.api.admin.controller.business;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest;
import com.glxp.api.admin.req.business.StockOrderIdsRequest;
import com.glxp.api.admin.req.business.StockSelectDataEntity;
import com.glxp.api.admin.req.info.SystemParamConfigRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.business.StockOrderDetailQueryProductResponse;
import com.glxp.api.admin.res.business.StockOrderDetailResponse;
import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.business.StockOrderDetailService;
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
import com.glxp.api.admin.service.business.StockQRCodeTextService;
import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.thread.IoTransInoutService;
import com.glxp.api.admin.util.FilterUdiUtils;
@ -30,8 +43,11 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
@ -48,12 +64,21 @@ public class StockOrderDetailController {
UdiInfoService udiInfoService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@Resource
private IoTransInoutService transInoutService;
@Autowired
private SystemParamConfigService systemParamConfigService;
@Resource
AuthAdminService authAdminService;
@Resource
BussinessTypeService bussinessTypeService;
@Resource
BussinessLocalTypeService bussinessLocalTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter")
public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -71,6 +96,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter2")
public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -92,6 +118,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/temp/filter")
public BaseResponse filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -109,7 +136,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/getStockOrderDetails")
public BaseResponse getStockOrderDetails(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -127,7 +154,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/order/detail")
public BaseResponse stockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -143,6 +170,7 @@ public class StockOrderDetailController {
return ResultVOUtils.success(erpOrderEntities);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/uploadCount")
public BaseResponse uploadCount(@RequestParam("orderId") String orderId, @RequestParam("code") String code) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@ -188,6 +216,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/getInstrument")
public BaseResponse getStockOrderDetailInstrument(@RequestParam("count") String count, @RequestParam("code") String code) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@ -211,33 +240,53 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/getInstrumentById")
public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
for (String id : stockOrderIdsRequest.getIds()) {
FilterUdiInfoRequest companyProductRelevanceRequest = new FilterUdiInfoRequest();
companyProductRelevanceRequest.setId(id);
if (stockOrderIdsRequest.getDatas() == null && stockOrderIdsRequest.getDatas().size() < 1) {
return ResultVOUtils.error(500, "未选择产品!");
}
for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setId(stockSelectDataEntity.getRelId());
companyProductRelevanceRequest.setDiType(1);
List<UdiRelevanceResponse> companyProductRelevanceResponses = udiRelevanceService.filterUdiGp(companyProductRelevanceRequest);
companyProductRelevanceRequest.setCustomerId(getCustomerId());
List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId());
filterUdiInfoRequest.setDiType(1);
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (udiRelevanceResponses.size() > 0) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId());
companyProductRelevanceResponses.add(companyProductRelevanceResponse);
}
} else
companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
UdiRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
stockOrderDetailEntity.setProductId(udiInfoEntity.getId() + "");
stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId() + "");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setBatchNo(stockSelectDataEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate());
stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if (stockOrderIdsRequest.getUdiEntity() != null) {
UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setCount(1 + "");
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
if (originDatas != null && originDatas.size() > 0) {
if (!isSameBatch(originDatas, stockOrderDetailEntity)) {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
@ -245,6 +294,7 @@ public class StockOrderDetailController {
} else {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
} else
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
@ -269,6 +319,7 @@ public class StockOrderDetailController {
return false;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/addFromCode")
public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId,
@RequestParam("count") String count,
@ -311,39 +362,13 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@GetMapping("/udiwms/stock/order/detail/addFromCodeById")
public BaseResponse addStockOrderDetailFromCodeById(@RequestParam("orderId") String orderId,
@RequestParam("id") String id) {
UdiInfoEntity udiInfoEntity =
udiInfoService.findByNameCode(id);
if (udiInfoEntity != null) {
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
stockOrderDetailEntity.setOrderIdFk(orderId);
stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode());
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setBatchNo(udiInfoEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(udiInfoEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiInfoEntity.getExpireDate());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setSweepCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
return ResultVOUtils.success();
}
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/queryProduct")
public BaseResponse queryProduct(@RequestParam("code") String code) {
public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) {
UdiEntity udiEntity = null;
if (StringUtils.isNotBlank(code)) {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setCustomerId(customerId);
if (code.length() > 13) {
String tStr = code.substring(0, 2);
@ -356,20 +381,18 @@ public class StockOrderDetailController {
}
}
StockOrderDetailQueryProductResponse stockOrderDetailQueryProductResponse = new StockOrderDetailQueryProductResponse();
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
if (udiEntity == null) {
filterUdiInfoRequest.setUnionCode(code);
companyProductRelevanceRequest.setUnionCode(code);
stockOrderDetailQueryProductResponse.setUdi(code);
} else {
filterUdiInfoRequest.setUnionCode(udiEntity.getUdi());
companyProductRelevanceRequest.setUnionCode(udiEntity.getUdi());
BeanUtils.copyProperties(udiEntity, stockOrderDetailQueryProductResponse);
}
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (basicInstrumentMaintainRelevanceResponses.size() == 1) {
stockOrderDetailQueryProductResponse.setGetType("1");
stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getId() + "");
stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getRlId() + "");
} else if (basicInstrumentMaintainRelevanceResponses.size() > 1) {
stockOrderDetailQueryProductResponse.setGetType("2");
} else {
@ -382,44 +405,64 @@ public class StockOrderDetailController {
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filterProduct")
public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
String nameCode = null;
UdiEntity udiEntity = null;
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
} else {
nameCode = filterUdiInfoRequest.getNameCode();
}
filterUdiInfoRequest.setNameCode(nameCode);
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
}
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
filterUdiInfoRequest.setDiType(1);
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType());
if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
companyProductRelevanceRequest.setCustomerId(null);
companyProductRelevanceRequest.setUnitFk(companyProductRelevanceRequest.getCorpId());
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
} else {
basicInstrumentMaintainRelevanceResponses = getHosDatas(filterUdiInfoRequest);
}
} else {
nameCode = filterUdiInfoRequest.getNameCode();
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
}
filterUdiInfoRequest.setNameCode(nameCode);
filterUdiInfoRequest.setDiType(1);
List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
//todo 为什么要把去掉使用单元
// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {
// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm());
// }
// }
// }
PageInfo<UdiRelevanceResponse> pageInfo;
PageInfo<CompanyProductRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<CompanyProductRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
public List<CompanyProductRelevanceResponse> getHosDatas(FilterUdiInfoRequest filterUdiInfoRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
}
return basicInstrumentMaintainRelevanceResponses;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/copy")
public BaseResponse uploadCount(@RequestParam("id") String id) {
if (StringUtils.isNotBlank(id)) {
@ -434,7 +477,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT);
}
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/order/detail/upload")
public BaseResponse upload(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
BindingResult bindingResult) {
@ -467,6 +510,7 @@ public class StockOrderDetailController {
return ResultVOUtils.error(500, "修改失败");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -481,6 +525,7 @@ public class StockOrderDetailController {
}
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/temp/delete")
public BaseResponse deleteTemp(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -494,4 +539,30 @@ public class StockOrderDetailController {
return ResultVOUtils.error(500, "删除失败");
}
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
/**
*
*
* @param stockOrderDetailEntities
* @return
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/order/detail/update")
public BaseResponse updateStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity) {
if (null != stockOrderDetailEntity)
stockOrderDetailService.updateById(stockOrderDetailEntity);
return ResultVOUtils.success("更新成功");
}
}

@ -1,18 +1,29 @@
package com.glxp.api.admin.controller.business;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.business.StockOrderPrintEntity;
import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
import com.glxp.api.admin.entity.inventory.StockPrintEntity;
import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
import com.glxp.api.admin.req.basic.FilterStockprintRequest;
import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest;
import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest;
import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest;
import com.glxp.api.admin.req.itextpdf.PdfPrintCountEntity;
import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest;
import com.glxp.api.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.SystemPDFTemplateRelevanceResponse;
import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
@ -20,17 +31,18 @@ import com.glxp.api.admin.service.business.StockOrderDetailService;
import com.glxp.api.admin.service.business.StockOrderDetailTempService;
import com.glxp.api.admin.service.business.StockOrderService;
import com.glxp.api.admin.service.business.StockQRCodeTextService;
import com.glxp.api.admin.service.info.SystemPDFModuleService;
import com.glxp.api.admin.service.info.SystemPDFTemplateService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.info.*;
import com.glxp.api.admin.service.inventory.InvStockPrintService;
import com.glxp.api.admin.service.inventory.StockPrintTempService;
import com.glxp.api.admin.thread.IoTransInoutService;
import com.glxp.api.admin.thread.JaspaperService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.JasperUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -40,6 +52,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -52,27 +65,28 @@ public class StockQRCodeTextController {
@Resource
StockOrderDetailService stockOrderDetailService;
@Resource
StockOrderDetailTempService stockOrderDetailTempService;
@Resource
StockQRCodeTextService stockQRCodeTextService;
@Resource
UdiInfoService udiInfoService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Resource
private BussinessTypeService bussinessTypeService;
private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
InvStockPrintService stockPrintService;
@Resource
CompanyService companyService;
@Value("${file_path}")
private String dirPath;
@Resource
private StockPrintTempService stockPrintTempService;
@Resource
private JaspaperService jaspaperService;
@Resource
private IoTransInoutService transInoutService;
@Autowired
private SystemParamConfigService systemParamConfigService;
private BussinessLocalTypeService bussinessLocalTypeService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/qrcode/text/filter")
public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
BindingResult bindingResult) {
@ -101,6 +115,7 @@ public class StockQRCodeTextController {
}
//-----------打印码
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file")
public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
@ -119,27 +134,202 @@ public class StockQRCodeTextController {
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/file")
public void stockQRCodeTextPDFFromTemplateFile(
public BaseResponse stockQRCodeTextPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
if (systemPDFModuleEntity == null) return null;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return null;
List<StockPrintEntity> printEntities = new ArrayList<>();
List<StockPrintEntity> mStockPrintEntities = new ArrayList<>();
FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterStockprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
List<StockPrintEntity> stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
// stockPrintEntity.setCorpName(companyEntity.getCompanyName());
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
StockPrintEntity clone = new StockPrintEntity();
BeanUtils.copyProperties(stockPrintEntity, clone);
printEntities.add(clone);
}
} else {
printEntities.add(stockPrintEntity);
}
}
if (printEntities.size() > 1000) { //如果标签打印数据大于1000则切割生成多个文件
List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();
for (int i = 0; i < splits.size(); i++) {
index++;
StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
String fileName = stockQRCodeTextPDFTemplateRequest.getQueryId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempEntity.setStatus(0);
stockPrintTempEntity.setGenKey(CustomUtil.getId());
stockPrintTempService.insertStockPrintTempEntity(stockPrintTempEntity);
stockPrintTempEntities.add(stockPrintTempEntity);
}
jaspaperService.printPdfLocal(splits, stockPrintTempEntities, systemPDFTemplateEntity.getPath());
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockPrintTempEntities);
return ResultVOUtils.success(pageSimpleResponse);
} else {
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", printEntities);
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity);
}
return null;
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile")
public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest
) throws Exception {
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
if (systemPDFModuleEntity == null) return;
if (systemPDFModuleEntity == null) return null;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return;
StockPrintEntity stockPrintEntity = stockPrintService.selectById(stockQRCodeTextPDFTemplateRequest.getId());
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", stockPrintEntity);
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity);
if (systemPDFTemplateEntity == null) return null;
List<StockPrintEntity> printEntities = new ArrayList<>();
List<StockPrintEntity> mStockPrintEntities = new ArrayList<>();
FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest();
DeleteStPrintTempRequest deleteStPrintTempRequest = new DeleteStPrintTempRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterStockprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
deleteStPrintTempRequest.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId() + "");
} else {
deleteStPrintTempRequest.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempService.deleteById(deleteStPrintTempRequest);
List<StockPrintEntity> stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
StockPrintEntity clone = new StockPrintEntity();
BeanUtils.copyProperties(stockPrintEntity, clone);
printEntities.add(clone);
}
} else {
printEntities.add(stockPrintEntity);
}
}
List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();
for (int i = 0; i < splits.size(); i++) {
index++;
StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
String fileName = stockQRCodeTextPDFTemplateRequest.getQueryId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempEntity.setStatus(0);
stockPrintTempEntity.setGenKey(CustomUtil.getId());
stockPrintTempService.insertStockPrintTempEntity(stockPrintTempEntity);
stockPrintTempEntities.add(stockPrintTempEntity);
}
jaspaperService.printPdfLocal(splits, stockPrintTempEntities, systemPDFTemplateEntity.getPath());
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity);
}
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockPrintTempEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/spms/stock/qrcode/filterTemp")
public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<StockPrintTempEntity> stockQRCodeTextEntityList
= stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest);
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockQRCodeTextEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, StockPrintEntity stockPrintEntity) {
for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(stockPrintEntity.getId() + "")) {
return pdfPrintCount;
}
}
return null;
}
//-----------打印订单
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/stock/order/file")
public BaseResponse inspectionStockOrderPDFFromTemplateFile(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
@ -149,60 +339,55 @@ public class StockQRCodeTextController {
if (stockOrderEntity == null) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单");
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setModuleId(2);
systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses.isEmpty()) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
} else {
SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
}
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/order/file")
public void stockOrderPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
/*
StockOrderEntity stockOrderEntity =
stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId());
if (stockOrderEntity == null) {
return;
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return;
stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath());
stockQRCodeTextPDFTemplateRequest.setRowCount(systemPDFTemplateEntity.getRowCount());
stockQRCodeTextPDFTemplateRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount());
//-----------------------------------------------
stockQRCodeTextPDFTemplateRequest.setOrderId(stockOrderEntity.getId());
stockQRCodeTextPDFTemplateRequest.setBillNo(stockOrderEntity.getBillNo());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(stockOrderEntity.getBillType());
stockQRCodeTextPDFTemplateRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
ITextPDFUtils.exportStockOrderPDFFromTemplateFile(
stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response);
*/
/*打印订单*/
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
if (list != null && list.size() > 0) {
int index = 1;
for (StockOrderPrintEntity stockOrderPrintEntity : list) {
stockOrderPrintEntity.setIndex(index + "");
stockOrderPrintEntity.setTitle(stockOrderPrintEntity.getCorpName());
// StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse();
// BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse);
// stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice());
// stockOrderPrintResponse.setTotalPrice(stockOrderPrintEntity.getTotalPrice());
// stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36));
// stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88));
// stockOrderPrintEntity.setTotalPriceWord("18888");
// stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName());
stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
index++;
// stockOrderPrintResponses.add(stockOrderPrintResponse);
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponses.get(0).getTemplateId()));
if (systemPDFTemplateEntity == null) return;
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", list);
@ -216,7 +401,7 @@ public class StockQRCodeTextController {
}
}
@AuthRuleAnnotation("")
@GetMapping(value = "/udiwms/stock/qrcode/text/upload")
public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
BindingResult bindingResult) {
@ -232,6 +417,7 @@ public class StockQRCodeTextController {
return ResultVOUtils.error(500, "修改失败");
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/stock/qrcode/text/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {

@ -110,7 +110,10 @@ public class SystemParamConfigController {
//出入库新增单据校验
if (systemParamConfigSaveRequest.getParamKey().equals("io_transInout_interval")) {
try {
int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cronStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cronStr);
@ -121,7 +124,10 @@ public class SystemParamConfigController {
}
} else if (systemParamConfigSaveRequest.getParamKey().equals("io_erpcheck_interval")) {
try {
int time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cronStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cronStr);
@ -130,6 +136,20 @@ public class SystemParamConfigController {
} catch (Exception e) {
return ResultVOUtils.error(500, "格式错误!");
}
} else if (systemParamConfigSaveRequest.getParamKey().equals("supplement_order_interval")) {
try {
int time = 5;
if (!"0".equals(systemParamConfigSaveRequest.getParamValue())) {
time = Integer.parseInt(systemParamConfigSaveRequest.getParamValue());
}
String cornStr = CronUtils.parseMinuteIntervel(time);
ScheduledEntity scheduledEntity = new ScheduledEntity();
scheduledEntity.setCron(cornStr);
scheduledEntity.setCronName("supplementOrderTask");
scheduledDao.modifyScheduled(scheduledEntity);
} catch (Exception e) {
return ResultVOUtils.error(500, "格式错误!");
}
}

@ -1,11 +1,15 @@
package com.glxp.api.admin.controller.inout;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.api.admin.controller.inout.utils.InoutUtils;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.entity.inout.OrderEntity;
@ -15,24 +19,27 @@ import com.glxp.api.admin.entity.inout.FilterErpOrderRequest;
import com.glxp.api.admin.req.inout.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.business.StockOrderService;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.service.inout.CodesTempService;
import com.glxp.api.admin.service.inout.OrderDetailService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.service.thrsys.ThrOrderService;
import com.glxp.api.admin.thread.InvProductsTrService;
import com.glxp.api.admin.thread.IoTransInoutService;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
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.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@ -48,7 +55,7 @@ public class OrderController {
@Resource
private OrderService orderService;
@Resource
private CodesService warehouseService;
private CodesService codesService;
@Resource
private CodesTempService codesTempService;
@Resource
@ -66,7 +73,44 @@ public class OrderController {
@Resource
InoutUtils inoutUtils;
@Resource
private OrderDetailService orderDetailService;
@Resource
IoTransInoutService ioTransInoutService;
@Resource
StockOrderService stockOrderService;
@Resource
InvProductsTrService invProductsTrService;
@Resource
CompanyService companyService;
@Value("${file_path}")
private String filePath;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/getUdi")
public BaseResponse getUdi(@RequestParam("code") String code) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (udiEntity == null) return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
return ResultVOUtils.success(udiEntity);
}
@AuthRuleAnnotation("")
@GetMapping("udiwms/inout/order/status")
public BaseResponse listOrderByStatus(OrderFilterRequest orderFilterRequest) {
List<OrderEntity> orderEntityList = orderService.filterList(orderFilterRequest);
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("udiwms/inout/order/error")
public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
List<OrderEntity> orderEntityList = orderService.filterList(orderFilterRequest);
PageInfo<OrderEntity> pageInfo;
@ -110,7 +154,7 @@ public class OrderController {
}
orderService.updateUnit(orderEntity);
warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp());
codesService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp());
return ResultVOUtils.success("添加成功");
}
@ -122,14 +166,17 @@ public class OrderController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
}
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(orderFilterRequest.getCode());
List<WarehouseEntity> warehouseEntityList = codesService.findByCode(orderFilterRequest.getCode());
orderEntityList = orderService.filterListByCode(warehouseEntityList);
} else {
orderEntityList = orderService.filterList(orderFilterRequest);
orderEntityList = orderService.filterListOr(orderFilterRequest);
}
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);
pageInfo = new PageInfo<>(orderEntityList);//TODO 已完成单据列表
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntityList);
@ -143,7 +190,7 @@ public class OrderController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(orderFilterByCodeRequest.getCode());
List<WarehouseEntity> warehouseEntityList = codesService.findByCode(orderFilterByCodeRequest.getCode());
List<OrderEntity> orderEntityList = orderService.filterListByCode(warehouseEntityList);
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);
@ -153,6 +200,48 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
//手持终端下载订单校验
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/download")
public BaseResponse downloadOrder(OrderFilterRequest orderFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
return ResultVOUtils.error(500, "单据未找到!");
} else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) {
return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据!");
} else
orderFilterRequest.setId(stockOrderEntity.getOrderIdFk());
if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) {
orderFilterRequest.setId(null);
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
orderFilterRequest.setContrastStatus(2);
// orderFilterRequest.setReceiveStatus(0);
// orderFilterRequest.setStatusOrOne(3);
}
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
List<WarehouseEntity> warehouseEntityList = codesService.findByCode(orderFilterRequest.getCode());
orderEntityList = orderService.filterListByCode(warehouseEntityList);
} else {
orderEntityList = orderService.filterListOr(orderFilterRequest);
}
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntityList);//TODO 已完成单据列表
PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/inout/order/updateExportStatus")
public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
BindingResult bindingResult) {
@ -167,113 +256,38 @@ public class OrderController {
return ResultVOUtils.success("更新成功");
}
// @PostMapping("/warehouse/inout/order/mergeOrder")
// public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
//
// List<String> orderList = orderMergeRequest.getOrderList();
// List<OrderEntity> mergeList = new ArrayList<>();
// if (orderList != null && orderList.size() > 1) {
// for (String orderId : orderList) {
// FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
// filterErpOrderRequest.setOrderId(orderId);
// OrderEntity orderEntity = orderService.findById(orderId);
// if (orderEntity != null) {
// mergeList.add(orderEntity);
// }
// myErpOrderService.deleteByOrderId(orderId);
//
// }
// String mainOrder = orderList.get(0);
// for (int i = 1; i < orderList.size(); i++) {
// warehouseService.updateOrderId(orderList.get(i), mainOrder);
// orderService.deleteByOrderId(orderList.get(i));
// }
// OrderEntity mainOrderEntity = orderService.findById(mainOrder);
// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(mainOrderEntity.getAction());
// List<String> docids = getDocids(mergeList);
// String docidStr = "";
// if (docids != null && docids.size() > 0) {
// for (String temp : docids) {
// docidStr = docidStr + "," + temp;
// }
// docidStr = docidStr.substring(1);
// }
// mainOrderEntity.setErpFk(docidStr);
// orderService.updateOrder(mainOrderEntity);
// if (docidStr.length() > 0) {
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(mainOrderEntity.getAction(), "orderQueryUrl");
// if (basicThirdSysDetailEntity == null) {
// return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义");
// }
// List<ErpOrderEntity> erpOrderEntities = null;
// if (basicThirdSysDetailEntity.getEnabled()) {
// if (basicThirdSysDetailEntity.getFromType() == 0) {
// erpOrderEntities = new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrder(docids, mainOrderEntity.getAction());
// } else {
// erpOrderEntities = thrOrderService.filterAllOrders(docids, basicThirdSysDetailEntity.getThirdSysFk());
// }
// } else {
// return ResultVOUtils.error(500, "第三方业务单据服务未启用!");
// }
//
// if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
// List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder,bussinessTypeEntity);
// myErpOrderService.insertErpOrders(returnOrders);
// List<WarehouseEntity> warehouseEntityList = warehouseService.findByReceiptId(mainOrder);
// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, myErpOrderService,
// orderService, warehouseEntityList, systemParamConfigService, erpOrderEntities);
// } else {
// mainOrderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
// mainOrderEntity.setRemark("获取ERP单失败");
// orderService.updateOrder(mainOrderEntity);
// List<WarehouseEntity> datas = warehouseService.findByReceiptId(mainOrder);
// inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
// return ResultVOUtils.error(500, "获取ERP单失败");
// }
// } else {
// new Thread(() -> {
// List<WarehouseEntity> datas = warehouseService.findByReceiptId(mainOrder);
// inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
// }).start();
// }
//
// } else {
// return ResultVOUtils.error(ResultEnum.DATA_ERROR);
// }
//
//
// return ResultVOUtils.success("合并成功,后台正在数据转换,请稍后刷新重试!");
// }
@PostMapping("/warehouse/inout/order/mergeOrder")
public BaseResponse mergeOrders(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<String> orderList = orderMergeRequest.getOrderList();
List<OrderEntity> mergeList = new ArrayList<>();
List<ErpOrderEntity> mergeList = new ArrayList<>();
if (orderList != null && orderList.size() > 1) {
for (String orderId : orderList) {
OrderEntity orderEntity = orderService.findById(orderId);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS) {
return ResultVOUtils.error(500, "已完成的订单不能合并!");
}
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
OrderEntity orderEntity = orderService.findById(orderId);
if (orderEntity != null) {
mergeList.add(orderEntity);
List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
mergeList.addAll(erpOrderEntities);
}
myErpOrderService.deleteByOrderId(orderId);
}
for (String orderId : orderList) {
orderDetailService.deleteByOrderId(orderId);
}
String mainOrder = orderList.get(0);
for (int i = 1; i < orderList.size(); i++) {
warehouseService.updateOrderId(orderList.get(i), mainOrder);
codesService.updateOrderId(orderList.get(i), mainOrder);
codesTempService.updateOrderId(orderList.get(i), mainOrder);
orderService.deleteByOrderId(orderList.get(i));
orderService.deleteById(orderList.get(i));
}
OrderEntity mainOrderEntity = orderService.findById(mainOrder);
List<String> docids = getDocids(mergeList);
@ -286,6 +300,7 @@ public class OrderController {
}
mainOrderEntity.setErpFk(docidStr);
orderService.updateOrder(mainOrderEntity);
// ioTransInoutService.transStatus(mainOrderEntity.getId());
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
@ -293,24 +308,31 @@ public class OrderController {
}
public List<String> getDocids(List<OrderEntity> mergeList) {
public List<String> getDocids(List<ErpOrderEntity> mergeList) {
List<String> docids = new ArrayList<>();
for (int i = 0; i < mergeList.size(); i++) {
OrderEntity orderEntity = mergeList.get(i);
if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) {
String[] erpFks = orderEntity.getErpFk().split(",");
if (erpFks.length > 0) {
for (int j = 0; j < erpFks.length; j++) {
docids.add(erpFks[j]);
}
}
}
Map<String, List<ErpOrderEntity>> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
for (String key : mapErps.keySet()) {
docids.add(key);
}
if (docids.size() > 1) {
return new ArrayList<>(new TreeSet<>(docids));
} else
return docids;
return docids;
}
/**
*
*
* @param billNo
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/supplementOrder")
public BaseResponse supplementOrder(@RequestParam("billNo") String billNo) {
if (StrUtil.isBlank(billNo)) {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(billNo);
return orderService.supplementOrder(stockOrderEntity.getBillNo(), stockOrderEntity.getOrderIdFk());
}

@ -1,6 +1,7 @@
package com.glxp.api.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
@ -9,6 +10,7 @@ import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.inout.*;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
@ -86,6 +88,55 @@ public class OrderDetailController {
@Resource
BussinessOriginTypeService bussinessOriginTypeService;
@AuthRuleAnnotation("")
@GetMapping("/spms/erpOrder/filter")
public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
// filterErpOrderRequest.setBillAction(filterErpOrderRequest.getOriginType());
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
if (data != null && data.size() > 0) {
for (ThrOrderEntity thrOrderEntity : data) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities =
thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse);
List<ErpOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount() + "");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount() + "");
subErpOrders.add(subErpOrder);
}
}
erpOrderResponse.setSubErpOrders(subErpOrders);
erpOrderResponses.add(erpOrderResponse);
}
}
PageInfo<ThrOrderEntity> pageInfo;
pageInfo = new PageInfo<>(data);
PageSimpleResponse<ErpOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
// }
}
//查询本地单据和第三方单据
@GetMapping("/udiwms/erpOrder/filter")
public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest,

@ -1,20 +1,27 @@
package com.glxp.api.admin.controller.inout;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.res.inout.WarehouseResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.inout.CodesTempService;
import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.inout.*;
import com.glxp.api.admin.thread.IoTransInoutService;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.FileUtils;
@ -29,18 +36,16 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.*;
import java.util.stream.Collectors;
@RestController
public class WareHouseController {
@Resource
private CodesService warehouseService;
private CodesService codesService;
@Resource
private IoTransInoutService transInoutService;
@Resource
@ -50,6 +55,40 @@ public class WareHouseController {
@Resource
private OrderService orderService;
@Resource
private IoTransInoutService ioTransInoutService;
@Resource
CompanyService companyService;
@Resource
AuthAdminService authAdminService;
@Resource
BasicUnitMaintainService basicUnitMaintainService;
@Resource
private WarehouseUserService warehouseUserService;
@Resource
private WarehouseBussinessTypeService warehouseBussinessTypeService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("")
@GetMapping("admin/warehouse/inout/list")
public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = codesService.listWarehouse(warehouseQueryRequest);
List<WarehouseResponse> warehouseResponses = warehouseEntityList.stream().map(item ->
{
WarehouseResponse warehouseResponse = new WarehouseResponse();
BeanUtils.copyProperties(item, warehouseResponse);
return warehouseResponse;
}).collect(Collectors.toList());
PageInfo<WarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(warehouseEntityList);
PageSimpleResponse<WarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(warehouseResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/warehouse/inout/code/deleteCodes")
public BaseResponse deleteCodes(@RequestBody DeleteCodeRequest deleteCodeRequest, BindingResult bindingResult) {
@ -68,7 +107,7 @@ public class WareHouseController {
@GetMapping("admin/warehouse/inout/findByNo")
public BaseResponse findByNo(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = warehouseService.findByNo(warehouseQueryRequest);
List<WarehouseEntity> warehouseEntityList = codesService.findByNo(warehouseQueryRequest);
List<WarehouseResponse> warehouseResponses = warehouseEntityList.stream().map(item ->
{
WarehouseResponse warehouseResponse = new WarehouseResponse();
@ -85,7 +124,7 @@ public class WareHouseController {
@GetMapping("admin/warehouse/inout/findByOrderId")
public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
List<WarehouseEntity> warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest);
List<WarehouseResponse> warehouseResponses = warehouseEntityList.stream().map(item ->
{
WarehouseResponse warehouseResponse = new WarehouseResponse();
@ -100,9 +139,100 @@ public class WareHouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inout/dlcode/findByOrderId")
public BaseResponse downloadCodesByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = codesService.findByOrderId(warehouseQueryRequest);
PageInfo<WarehouseEntity> pageInfo;
pageInfo = new PageInfo<>(warehouseEntityList);
PageSimpleResponse<WarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(warehouseEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/commit")//TODO 重新提交
public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
ioTransInoutService.repeatCommit(commitRequest);
return ResultVOUtils.success("提交成功");
}
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
return saveOrderWeb(orderEntity);
// return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/saveOrderWeb")
public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
OrderEntity orderEntity1 = new OrderEntity();
orderEntity1.setId(addOrderRequest.getOrderId());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
orderEntity1.setAction(addOrderRequest.getAction());
orderEntity1.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity1.setFromCorp(addOrderRequest.getFromCorp());
orderEntity1.setFromCorpId(addOrderRequest.getFromCorpId());
orderEntity1.setLocStorageCode(addOrderRequest.getLocStorageCode());
orderService.updateOrder(orderEntity1);
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/admin/warehouse/inout/save")
public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
WarehouseEntity warehouseEntity = new WarehouseEntity();
BeanUtils.copyProperties(warehouseSaveRequest, warehouseEntity);
boolean b = codesService.insertWarehouse(warehouseEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("添加成功");
}
@AuthRuleAnnotation("")
@GetMapping("warehouse/inout/deleteCodesTempById")
public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) {
WarehouseEntity warehouseEntity = new WarehouseEntity();
warehouseEntity.setId(id);
codesTempService.deleteCodesTempById(warehouseEntity);
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/addCommit")//补录提交
public BaseResponse addCommitOrder(@RequestBody CommitRequest commitRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
OrderEntity orderEntity = orderService.findById(commitRequest.getOrderId());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderService.updateOrder(orderEntity);
return ResultVOUtils.success("提交成功");
}
@GetMapping("admin/warehouse/inout/findAllByOrderId")
public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
List<WarehouseEntity> warehouseEntityList = warehouseService.findAllByOrderId(warehouseQueryRequest);
List<WarehouseEntity> warehouseEntityList = codesService.findAllByOrderId(warehouseQueryRequest);
List<WarehouseResponse> warehouseResponses = warehouseEntityList.stream().map(item ->
{
WarehouseResponse warehouseResponse = new WarehouseResponse();
@ -183,19 +313,6 @@ public class WareHouseController {
return ResultVOUtils.success("导入成功");
}
//单据立即提交校验
@PostMapping("/warehouse/inout/commit")
public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
transInoutService.repeatCommit(commitRequest);
return ResultVOUtils.success("提交成功,后台已开启重码校验,请稍后刷新查看!");
}
//网页端数据上传调用接口
@PostMapping("warehouse/inout/addOrderWeb")
public BaseResponse addOrderWeb(@RequestBody AddOrderRequest addOrderRequest, BindingResult bindingResult) {
@ -277,6 +394,7 @@ public class WareHouseController {
}
//网页端数据上传调用接口
@AuthRuleAnnotation("")
@PostMapping("warehouse/inout/postOrdersWeb")
public BaseResponse postOrdersWeb(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) {
@ -284,7 +402,9 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
try {
transInoutService.creatOrderWeb(postOrderRequest);
Integer userId = customerService.getUserId();
postOrderRequest.setUserId(userId);
ioTransInoutService.creatOrderWeb(postOrderRequest);
} catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
@ -314,11 +434,64 @@ public class WareHouseController {
}
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(@RequestParam("orderId") String orderId) {
orderService.updateOrderStatus(orderId, ConstantStatus.ORDER_STATUS_PROCESS);
// @GetMapping("warehouse/inout/submitOrderWeb")
// public BaseResponse submitOrderWeb(@RequestParam("orderId") String orderId) {
// orderService.updateOrderStatus(orderId, ConstantStatus.ORDER_STATUS_PROCESS);
// return ResultVOUtils.success();
// }
/**
*
*
* @param code
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/warehouse/inout/warehouseUserList")
public BaseResponse getWarehouseUserList(String code) {
if (StringUtils.isBlank(code))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
return ResultVOUtils.success(warehouseUserService.getListByCode(code));
}
@AuthRuleAnnotation("")
@GetMapping("/warehouse/inout/warehouseBussniessTypeList")
public BaseResponse getWarehouseBussniessTypeList(String code) {
if (StrUtil.isBlank(code))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
return ResultVOUtils.success(warehouseBussinessTypeService.getListByCode(code));
}
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/saveWarehouseUser")
public BaseResponse saveWarehouseUser(@RequestBody Map<String, Object> params) {
String code = String.valueOf(params.get("code"));
String userListJson = String.valueOf(params.get("userList"));
if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class));
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/saveWarehouseBussinessType")
public BaseResponse saveWarehouseBussinessType(@RequestBody Map<String, Object> params) {
String code = String.valueOf(params.get("code"));
String bussinessTypeJson = String.valueOf(params.get("bussinessTypes"));
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/warehouse/inout/updateDirector")
public BaseResponse updateDirector(Integer id) {
if (null == id)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseUserService.updateDirector(id);
return ResultVOUtils.success();
}
}

@ -177,7 +177,7 @@ public class ContrastErpUtil {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderService.updateOrder(orderEntity);
ioTransInoutService.printOrder(orderEntity.getId());
invProductsTrService.genInvProducts(orderEntity.getId());
}
if (errorData.size() > 0) {

@ -0,0 +1,148 @@
package com.glxp.api.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.api.admin.entity.inventory.InvProductEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.api.admin.req.inventory.FilterInvProductRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvProductDetailResponse;
import com.glxp.api.admin.res.inventory.InvProductPageRespnonse;
import com.glxp.api.admin.res.inventory.InvProductResponse;
import com.glxp.api.admin.res.inventory.InvProductStatResponse;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.inventory.InvPreProductDetailService;
import com.glxp.api.admin.service.inventory.InvPreProductService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
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.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
public class InvPreProductsController {
@Resource
InvPreProductService invProductService;
@Resource
InvPreProductDetailService invProductDetailService;
@Resource
private CompanyService companyService;
@AuthRuleAnnotation("")
@GetMapping("spms/pre/inv/products/filter")
public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false;
// if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
// filterInvProductRequest.setCustomerId(null);
// showSup = true;
// } else {
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId()));
// filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
// filterInvProductRequest.setCustomerId(null);
// }
List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
PageInfo<InvProductResponse> pageInfo;
pageInfo = new PageInfo<>(invProductResponses);
InvProductPageRespnonse<InvProductResponse> pageSimpleResponse = new InvProductPageRespnonse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invProductResponses);
pageSimpleResponse.setShowSup(showSup);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("spms/pre/inv/products/filterDetail")
public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) {
// if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
// filterInvProductRequest.setCustomerId(null);
//// filterInvProductRequest.setSupId();
// }
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest);
PageInfo<InvProductDetailEntity> pageInfo;
pageInfo = new PageInfo<>(invProductDetailEntities);
List<InvProductDetailResponse> invProductDetailResponses = new ArrayList<>();
if (invProductDetailEntities.size() > 0) {
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
InvProductDetailResponse invProductDetailResponse = new InvProductDetailResponse();
BeanUtils.copyProperties(invProductDetailEntity, invProductDetailResponse);
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invProductDetailResponse.setMainActionStr("出库");
invProductDetailResponse.setOutCount(invProductDetailEntity.getCount());
} else {
invProductDetailResponse.setMainActionStr("入库");
invProductDetailResponse.setInCount(invProductDetailEntity.getCount());
}
invProductDetailResponses.add(invProductDetailResponse);
}
}
PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invProductDetailResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("spms/pre/inv/products/delete")
public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
InvProductEntity invProductEntity = invProductService.selectById(id);
if (invProductEntity != null) {
invProductService.deleteById(id);
FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
detailRequest.setSupId(invProductEntity.getSupId());
detailRequest.setBatchNo(invProductEntity.getBatchNo());
detailRequest.setProductIdFk(invProductEntity.getRelIdFk());
invProductDetailService.deleteByProductId(detailRequest);
return ResultVOUtils.success("删除成功");
} else {
return ResultVOUtils.error(500, "删除失败!");
}
}
@AuthRuleAnnotation("")
@GetMapping("spms/pre/inv/products/stat")
public BaseResponse statInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
InvProductStatResponse invProductStatResponse = new InvProductStatResponse();
//统计预入库数量
FilterInvProductDetailRequest temp1 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp1);
temp1.setPurchaseType(ConstantStatus.PRUCHASE_ADVANCE);
invProductStatResponse.setAdvanceCount(invProductDetailService.statCount(temp1));
//统计普通采购数量
FilterInvProductDetailRequest temp2 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp2);
temp2.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
invProductStatResponse.setCommonCount(invProductDetailService.statCount(temp2));
//统计入库数量
FilterInvProductDetailRequest temp3 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp3);
temp3.setMainAction(ConstantType.TYPE_PUT);
invProductStatResponse.setInCount(invProductDetailService.statCount(temp3));
//统计出库数量
FilterInvProductDetailRequest temp4 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp4);
temp4.setMainAction(ConstantType.TYPE_OUT);
invProductStatResponse.setOutCount(invProductDetailService.statCount(temp4));
return ResultVOUtils.success(invProductStatResponse);
}
}

@ -1,10 +1,13 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.info.CompanyEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.api.admin.entity.inventory.InvProductEntity;
@ -20,6 +23,7 @@ import com.glxp.api.admin.res.inventory.InvProductResponse;
import com.glxp.api.admin.res.inventory.InvProductStatResponse;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.CompanyService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inventory.InvProductDetailService;
import com.glxp.api.admin.service.inventory.InvProductService;
@ -58,6 +62,8 @@ public class InvProductsController {
private UdiRelevanceService udiRelevanceService;
@Resource
private UdiInfoService udiInfoService;
@Resource
private CompanyService companyService;
@GetMapping("spms/inv/products/filter")
public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
@ -223,7 +229,6 @@ public class InvProductsController {
code = filterCodeTraceRequest.getCode();
}
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setCode(code);
filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
@ -251,5 +256,43 @@ public class InvProductsController {
}
/**
*
*
* @param filterInvProductRequest
* @return
*/
@AuthRuleAnnotation("")
@GetMapping("/spms/inv/products/stockStatistics")
public BaseResponse stockStatistics(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false;
// if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
// filterInvProductRequest.setCustomerId(null);
// showSup = true;
// } else {
// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId()));
// filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
// filterInvProductRequest.setCustomerId(null);
// }
List<InvProductResponse> invProductResponses;
if (StrUtil.isBlank(filterInvProductRequest.getCpmctymc()) && StrUtil.isBlank(filterInvProductRequest.getNameCode())
&& StrUtil.isBlank(filterInvProductRequest.getGgxh()) && StrUtil.isBlank(filterInvProductRequest.getZczbhhzbapzbh())
&& StrUtil.isBlank(filterInvProductRequest.getYlqxzcrbarmc()) && StrUtil.isBlank(filterInvProductRequest.getSupId())
&& StrUtil.isBlank(filterInvProductRequest.getInvStorageCode()) && StrUtil.isBlank(filterInvProductRequest.getBatchNo())) {
//参数为空,走库存查询逻辑
invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
} else {
//参数不为空,走库存统计逻辑
invProductResponses = invProductService.stockStatistics(filterInvProductRequest);
}
PageInfo<InvProductResponse> pageInfo = new PageInfo<>(invProductResponses);
InvProductPageRespnonse<InvProductResponse> pageSimpleResponse = new InvProductPageRespnonse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
pageSimpleResponse.setShowSup(showSup);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -1,6 +1,8 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
@ -8,21 +10,27 @@ import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseExportResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseResponse;
import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.FileUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
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.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -33,7 +41,10 @@ public class InvWarehouseController {
@Resource
InvWarehouseService invWarehouseService;
@Resource
CustomerService customerService;
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
@ -44,6 +55,7 @@ public class InvWarehouseController {
return ResultVOUtils.success(restMap);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAll")
public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
filterInvWarehouseRequest.setPid(0);
@ -51,6 +63,17 @@ public class InvWarehouseController {
return ResultVOUtils.success(invWarehouseEntities);
}
@AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filterAllByUser")
public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
Integer userId = customerService.getUserId();
filterInvWarehouseRequest.setUserId(userId);
filterInvWarehouseRequest.setPid(0);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
return ResultVOUtils.success(invWarehouseEntities);
}
public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities,
Integer pid) {
List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();
@ -65,7 +88,7 @@ public class InvWarehouseController {
return invWarehouseResponses;
}
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/save")
public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) {
@ -74,8 +97,27 @@ public class InvWarehouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (invWarehouseEntity.getPid() == null) {
if (invWarehouseEntity.getPid() == null) {//仓库
invWarehouseEntity.setPid(0); // 默认设置
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
} else {//货位
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
InvWarehouseEntity pEntity = invWarehouseService.selectById(invWarehouseEntity.getPid() + "");
if (codeEntity == null) {
int code = Integer.parseInt(pEntity.getCode()) * 1000;
invWarehouseEntity.setCode(code + "");
} else {
invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
}
invWarehouseEntity.setAdvanceType(pEntity.getAdvanceType());
invWarehouseEntity.setLevel(pEntity.getLevel());
invWarehouseEntity.setPcode(pEntity.getPcode());
}
boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity);
@ -86,6 +128,7 @@ public class InvWarehouseController {
return ResultVOUtils.success("添加成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/edit")
public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) {
@ -105,6 +148,7 @@ public class InvWarehouseController {
return ResultVOUtils.success();
}
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
@ -174,4 +218,54 @@ public class InvWarehouseController {
return ResultVOUtils.success(pageSimpleResponse);
}
//仓库信息文件导出
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/exportJson")
public void exportJson(@RequestBody DeleteRequest deleteRequest, HttpServletResponse res) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
InvWarehouseExportResponse invWarehouseExportResponse = new InvWarehouseExportResponse();
invWarehouseExportResponse.setInvWarehouseEntities(invWarehouseEntities);
String json = JSONObject.toJSON(invWarehouseExportResponse).toString();
String fileName = "仓库信息导出_" + DateUtil.getDate() + ".udi";
res.setHeader("Content-disposition", "attachment;fileName=" + fileName);
res.setContentType("text/plain;charset=UTF-8");
try {
res.getOutputStream().write(json.getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
e.printStackTrace();
}
}
//仓库信息文件导入
@AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/uploadJson")
public BaseResponse uploadOrders(@RequestParam("file") List<MultipartFile> files) {
for (int i = 0; i < files.size(); i++) {
MultipartFile file = files.get(i);
if (file.isEmpty()) {
return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败");
}
String filename = file.getOriginalFilename();
String fileType = filename.substring(filename.lastIndexOf("."));
if (!".udi".equals(fileType)) {
return ResultVOUtils.error(500, "请上传udi格式文件");
}
try {
InputStream inputStream = file.getInputStream();
String json = FileUtils.readStream(inputStream);
InvWarehouseExportResponse invWarehouseExportResponse = (InvWarehouseExportResponse) JSON.parseObject(json, InvWarehouseExportResponse.class);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseExportResponse.getInvWarehouseEntities();
if (invWarehouseEntities != null) {
invWarehouseService.importInvWarehouse(invWarehouseEntities);
}
} catch (IOException e) {
e.printStackTrace();
}
}
return ResultVOUtils.success("后台正在导入仓库信息,请稍后查看!");
}
}

@ -8,15 +8,17 @@ import java.util.List;
@Mapper
public interface AuthAdminDao {
/**
*
*
* @return
*/
List<AuthAdmin> listAdminPage(AuthAdminQueryRequest authAdminQueryRequest);
/**
* id
*
* @param id id
* @return
*/
@ -24,6 +26,7 @@ public interface AuthAdminDao {
/**
* id password
*
* @param id id
* @return
*/
@ -31,30 +34,41 @@ public interface AuthAdminDao {
/**
* Name
*
* @param userName
* @return
*/
AuthAdmin findByUserName(String userName);
/**
*
*
* @param authAdmin
* @return
*/
boolean insertAuthAdmin(AuthAdmin authAdmin);
/**
*
*
* @param authAdmin
* @return
*/
boolean updateAuthAdmin(AuthAdmin authAdmin);
/**
*
*
* @param id
* @return
*/
boolean deleteById(Long id);
/**
*
*
* @return
*/
List<AuthAdmin> selectHospitalUser();
}

@ -18,4 +18,7 @@ public interface BussinessChangeTypeDao {
boolean insertBusChangeTypee(BussinessChangeTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByAction(@Param("scAction") String scAction);
}

@ -18,6 +18,11 @@ public interface BussinessLocalTypeDao {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);
BussinessLocalTypeEntity findBTByName(String name);

@ -24,5 +24,32 @@ public interface BussinessTypeDao {
boolean deleteById(@Param("id") String id);
BussinessTypeEntity selectByAction(String action);
List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest);
/**
*
*
* @param billNo
* @return
*/
String selectEnableSupplementOrder(String billNo);
/**
*
*
* @param mainAction
* @return
*/
List<BussinessTypeEntity> selectCandidateBussinsessTypes(String mainAction);
/**
*
*
* @param supplementOrderType
* @param action
*/
void updateSupplementOrderType(@Param("supplementOrderType") String supplementOrderType, @Param("action") String action);
}

@ -29,6 +29,16 @@ public interface StockOrderDao {
List<StockOrderEntity> filterListOr(StockOrderFilterRequest stockOrderFilterRequest);
StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest);
List<StockOrderPrintEntity> listOrderPrint(StockOrderFilterRequest stockOrderFilterRequest);
void updateSupplementNoByBillNo(@Param("billNo") String billNo, @Param("supplementOrderNo") String supplementOrderNo);
/**
*
*
* @return
*/
List<StockOrderEntity> selectSupplementOrderList();
}

@ -40,4 +40,11 @@ public interface CodesDao {
boolean updateSupId(@Param("supId") String supId, @Param("nameCode") String nameCode, @Param("orderId") String orderId);
WarehouseEntity getByCorpOrderId(String corpOrderId);
boolean deleteByOrderId(@Param("orderId") String orderId);
}

@ -38,6 +38,8 @@ public interface OrderDao {
boolean updateRemark(@Param("orderId") String orderId, @Param("remark") String remark);
List<OrderEntity> filterListOr(OrderFilterRequest orderFilterRequest);
List<OrderEntity> filterList(OrderFilterRequest orderFilterRequest);
List<OrderEntity> filterNoSort(OrderFilterRequest orderFilterRequest);

@ -0,0 +1,34 @@
package com.glxp.api.admin.dao.inout;
import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface WarehouseBussinessTypeDao {
int deleteByPrimaryKey(Integer id);
int insert(WarehouseBussinessTypeEntity record);
int insertOrUpdate(WarehouseBussinessTypeEntity record);
int insertOrUpdateSelective(WarehouseBussinessTypeEntity record);
int insertSelective(WarehouseBussinessTypeEntity record);
WarehouseBussinessTypeEntity selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(WarehouseBussinessTypeEntity record);
int updateByPrimaryKey(WarehouseBussinessTypeEntity record);
int updateBatch(List<WarehouseBussinessTypeEntity> list);
int updateBatchSelective(List<WarehouseBussinessTypeEntity> list);
int batchInsert(@Param("list") List<WarehouseBussinessTypeEntity> list);
List<WarehouseBussinessTypeEntity> selectListByCode(@Param("code") String code);
void deleteByCode(@Param("code") String code);
}

@ -0,0 +1,50 @@
package com.glxp.api.admin.dao.inout;
import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface WarehouseUserDao {
int deleteByPrimaryKey(Integer id);
int insert(WarehouseUserEntity record);
int insertOrUpdate(WarehouseUserEntity record);
int insertOrUpdateSelective(WarehouseUserEntity record);
int insertSelective(WarehouseUserEntity record);
WarehouseUserEntity selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(WarehouseUserEntity record);
int updateByPrimaryKey(WarehouseUserEntity record);
int updateBatch(List<WarehouseUserEntity> list);
int updateBatchSelective(List<WarehouseUserEntity> list);
int batchInsert(@Param("list") List<WarehouseUserEntity> list);
List<WarehouseUserEntity> selectListByCode(@Param("code") String code);
void deleteByCode(@Param("code") String code);
/**
*
*
* @param code
* @param isDirector
*/
void updateDirector(@Param("code") String code, @Param("isDirector") int isDirector);
/**
* id
*
* @param id
* @param isDirector
*/
void updateDirectorById(@Param("id") Integer id, @Param("isDirector") int isDirector);
}

@ -0,0 +1,31 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvProductEntity;
import com.glxp.api.admin.req.inventory.FilterInvProductRequest;
import com.glxp.api.admin.res.inventory.InvProductResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface InvPreProductDao {
List<InvProductEntity> filterInvProduct(FilterInvProductRequest filterInvProductRequest);
List<InvProductResponse> filterJoinInvProduct(FilterInvProductRequest filterInvProductRequest);
boolean insertInvProduct(InvProductEntity invProductEntity);
boolean updateInvProduct(InvProductEntity invProductEntity);
InvProductEntity selectByUuid(@Param("relIdFk") String relIdFk, @Param("batchNo") String batchNo,
@Param("supId") String supId, @Param("invStorageCode") String invStorageCode,
@Param("invWarehouseCode") String invWarehouseCode);
InvProductEntity selectById(@Param("id") String id);
boolean deleteById(@Param("id") String id);
}

@ -0,0 +1,29 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.api.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface InvPreProductDetailDao {
List<InvProductDetailEntity> filterInvProductDetail(FilterInvProductDetailRequest filterInvProductDetailRequest);
List<InvProductDetailJoinResponse> filterJoinInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
boolean insertInvProductDetail(InvProductDetailEntity invProductDetailEntity);
boolean insertInvProductDetails(@Param("invProductDetailEntitys") List<InvProductDetailEntity> invProductDetailEntitys);
boolean updateInvProductDetail(InvProductDetailEntity invProductDetailEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByProductId(FilterInvProductDetailRequest filterInvProductDetailRequest);
int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest);
}

@ -16,11 +16,19 @@ public interface InvProductDao {
List<InvProductResponse> filterJoinInvProduct(FilterInvProductRequest filterInvProductRequest);
InvProductEntity selectByUuid(@Param("relIdFk") String relIdFk, @Param("batchNo") String batchNo,
@Param("supId") String supId, @Param("invStorageCode") String invStorageCode,
@Param("invWarehouseCode") String invWarehouseCode);
boolean insertInvProduct(InvProductEntity invProductEntity);
boolean updateInvProduct(InvProductEntity invProductEntity);
InvProductEntity selectById(@Param("id") String id);
InvProductEntity selectById(@Param("id") String id);
boolean deleteById(@Param("id") String id);
//库存统计查询
List<InvProductResponse> stockStatistics(FilterInvProductRequest filterInvProductRequest);
}

@ -12,6 +12,8 @@ public interface InvStockPrintDao {
List<StockPrintEntity> filterStockPrint(FilterStockprintRequest filterStockprintRequest);
List<StockPrintEntity> filterJoinStockPrint(FilterStockprintRequest filterStockprintRequest);
StockPrintEntity findByNameCode(@Param("nameCode") String nameCode);
StockPrintEntity findByRlId(FilterStockprintRequest udiRlIdFk);

@ -20,6 +20,19 @@ public interface InvWarehouseDao {
boolean deleteById(@Param("id") String id);
List<InvWarehouseEntity> filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest);
InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest);
String getNameByCode(@Param("fromCorpId") String fromCorpId);
/**
*
*
* @param invWarehouseEntities
*/
void importInvWarehouse(@Param("invWarehouseEntities") List<InvWarehouseEntity> invWarehouseEntities);
/**
* ID
*

@ -0,0 +1,20 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
import com.glxp.api.admin.req.inventory.DeleteStPrintTempRequest;
import com.glxp.api.admin.req.inventory.FilterStPrintTempRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface StockPrintTempDao {
List<StockPrintTempEntity> filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest);
boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest);
boolean insertStockPrintTempEntity(StockPrintTempEntity stockPrintEntity);
boolean updateStockPrintTempEntity(StockPrintTempEntity stockPrintEntity);
}

@ -14,7 +14,7 @@ public class BussinessChangeTypeEntity {
private Integer beforeTime;
private String remark;
private String name;
private Integer changeType;
public Integer getBeforeTime() {
if (beforeTime == null)

@ -11,12 +11,12 @@ public class BussinessLocalTypeEntity {
private String originAction;
private String localName;
private String remark;
private Boolean enable;
private Boolean checkEnable;
private Boolean advanceType;
private Boolean changeEnable;
private int corpType;
private boolean genUnit;
private String mainAction;
private boolean checkEnable;
private boolean advanceType;
private boolean changeEnable;
private boolean spUse;
private String storageCode;
private Boolean spUse;
private int corpType;
}

@ -14,10 +14,12 @@ public class BussinessTypeEntity {
private String localAction;
private String thirdAction;
private boolean checkEnable;
private boolean advanceType;
private boolean genUnit;
private boolean innerOrder;
private boolean secCheckEnable;
private String thirdSys;
private boolean checkUdims;
private boolean checkPdaEd;
private boolean checkPdaUn;
@ -37,4 +39,11 @@ public class BussinessTypeEntity {
private int corpType;
private String storageCode;
private String localName;
private Boolean spUse;
//补单类型
private String supplementOrderType;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.entity.basic;
import lombok.Data;
@Data
public class CndidateRequest {
String mainAction;
String curAction;
}

@ -29,4 +29,14 @@ public class UdiRelevanceEntity {
//阳光菜头平台编码
private String udplatCode;
private Boolean isLock;
private Integer lockStatus;
private Boolean isAdavence;
public Integer getLockStatus() {
if (lockStatus == null)
return 1;
return lockStatus;
}
}

@ -2,6 +2,8 @@ package com.glxp.api.admin.entity.business;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderDetailEntity {
@ -19,4 +21,19 @@ public class StockOrderDetailEntity {
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
//销售清单号(第二票)
private String secSalesListNo;
//销售发票号(第一票)
private String firstSalesInvNo;
//销售发票号(第二票)
private String secSalesInvNo;
//开票日期
private String invoiceDate;
}

@ -28,4 +28,11 @@ public class StockOrderEntity {
private String orderIdFk;
private BigDecimal totalPrice;
private String locStorageCode;
//补单单号
private String supplementNo;
private Integer createUser;
private Integer reviewUser;
}

@ -2,6 +2,8 @@ package com.glxp.api.admin.entity.business;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderPrintEntity extends StockOrderDetailEntity {
@ -21,4 +23,22 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String unitIdFk;
private String customerId;
private String locStorageCode;
private BigDecimal totalPrice;
public BigDecimal getPrice() {
// if (price == null)
// return new BigDecimal(0);
return price;
}
private BigDecimal price;
private BigDecimal amount;
private String title;
private String zczbhhzbapzbh;
private String index;
private String totalPriceWord;
private String orderName;
}

@ -22,4 +22,21 @@ public class OrderEntity {
private String stockCheckFk;
private String remark;
private String locStorageCode;
private Integer receiveStatus;
private String supId;
private String customerId;
private String exportFilePath;
private Integer dlCount;
private String invStorageCode;
private String invWarehouseCode;
//补单单号
private String supplementNo;
private String ullageSupNo;
private Integer createUser;
private Integer reviewUser;
private boolean isError;
}

@ -0,0 +1,29 @@
package com.glxp.api.admin.entity.inout;
import lombok.Data;
/**
* -
*/
@Data
public class WarehouseBussinessTypeEntity {
/**
* id
*/
private Integer id;
/**
*
*/
private String code;
/**
*
*/
private String action;
/**
*
*/
private String name;
}

@ -27,4 +27,27 @@ public class WarehouseEntity {
private Integer status;
private String supId;
private String locStorageCode;
private String customerId;
private String invStorageCode;
private String invWarehouseCode;
public String getSupId() {
// if (supId == null) {
// return fromCorpId;
// }
return supId;
}
public Integer getCount() {
if (count == null) {
return 1;
}
if (count == 0)
return 1;
return count;
}
}

@ -0,0 +1,37 @@
package com.glxp.api.admin.entity.inout;
import lombok.Data;
/**
* -
*/
@Data
public class WarehouseUserEntity {
/**
* id
*/
private Integer id;
/**
*
*/
private String code;
/**
* id
*/
private Long userid;
/**
* /
*/
private String username;
/**
*
*/
private boolean isDirector;
private String employeeName;
}

@ -23,4 +23,6 @@ public class InvProductDetailEntity {
private String stockIdFk;
private String supId;
private String originCode;
private String invStorageCode;
private String invWarehouseCode;
}

@ -20,6 +20,8 @@ public class InvProductEntity {
private String customerId;
private String supId;
private String unitFk;
private String invStorageCode;
private String invWarehouseCode;
public Integer getInCount() {
if (inCount == null)
@ -31,4 +33,5 @@ public class InvProductEntity {
if (outCount == null)
return 0;
return outCount;
}}
}
}

@ -6,8 +6,8 @@ import java.util.Date;
@Data
public class InvWarehouseEntity {
private Integer level;
private String pcode;
private Integer id;
private Integer pid;
private String code;

@ -34,4 +34,8 @@ public class StockPrintEntity {
private String sDetailId;
private Date updateTime;
private Integer count;
private String corpName;
}

@ -0,0 +1,16 @@
package com.glxp.api.admin.entity.inventory;
import lombok.Data;
@Data
public class StockPrintTempEntity {
private Integer id;
private String fileName;
private String filePath;
private Integer status;
private String printCodeIdFk;
private String stockOrderFk;
private String genKey;
}

@ -0,0 +1,10 @@
package com.glxp.api.admin.req.basic;
import lombok.Data;
@Data
public class BusNoUserRequest {
private String curAction;
}

@ -13,4 +13,5 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
private Boolean changeEnable;
private Boolean isFilterBind;
private Boolean spUse;
private String code;
}

@ -45,4 +45,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private Integer lockStatus;
private Boolean isAdavence;
private String unitFk;
private String corpId;
private String billType;
}

@ -20,4 +20,5 @@ public class FilterStockprintRequest extends ListPageRequest {
private String sOrderId;
private String sDetailId;
private String id;
}

@ -11,15 +11,13 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String nameCode;
private String uuid;
private String ggxh;
private String thirdId;
private String id;
private String thirdId;
private String thirdId1;
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String ybbm;
private String sptm;
private String thirdCode;
@ -33,13 +31,22 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String unionCode;
private String udiCode;
private String thrPiId;
private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询
private Boolean isCheck;
private Integer filterType; //0:全部1.对照完成2.未对照DI3.未对照产品编码4.未对照其他产品编码
private Integer lockStatus;
private String customerId;
private String udplatCode;
private String mainId;
private Boolean isAdavence;
private String corpId;
private String billType;
private String ybbm;
private String sptm;
private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询
}

@ -3,6 +3,8 @@ package com.glxp.api.admin.req.business;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderDetailFilterRequest extends ListPageRequest {
@ -20,4 +22,6 @@ public class StockOrderDetailFilterRequest extends ListPageRequest {
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
}

@ -31,4 +31,9 @@ public class StockOrderFilterRequest extends ListPageRequest {
private String thirdOrderFk;
private String locStorageCode; //当前仓库号
private Integer createUser;
private Integer reviewUser;
private Integer userId;
}

@ -14,4 +14,5 @@ public class StockOrderIdsRequest {
boolean filterUDIType;
UdiEntity udiEntity;
List<StockOrderDetailEntity> stockOrderLists;
List<StockSelectDataEntity> datas;
}

@ -3,6 +3,7 @@ package com.glxp.api.admin.req.business;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
@ -24,4 +25,8 @@ public class StockOrderPostRequest {
private List<StockOrderDetailEntity> subErpOrders;
private String customerId;
private String locStorageCode;
private BigDecimal price;
private String unitIdFk;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.business;
import lombok.Data;
@Data
public class StockSelectDataEntity {
private String relId;
private String batchNo;
private String expireDate;
private String productDate;
}

@ -21,4 +21,16 @@ public class OrderFilterRequest extends ListPageRequest {
private Integer process;
private String unionStatus;
private String fromCorpId;
private Integer receiveStatus;
private Integer statusOrOne;
private String customerId;
private String orderId;//业务单据ID手持终端上传上来的
private String ullageSupNo;
private Integer createUser;
private Integer reviewUser;
private Integer userId;
private String locStorageCode;
}

@ -4,11 +4,13 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostOrderRequest {
List<PostOrder> postOrders;
int submitType;//0提交1保存
String oldOrderId;//保存再编辑后再保存或提交根据旧id删除旧数据。
private Integer userId;
public List<PostOrder> getPostOrder() {
return postOrders;

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.inventory;
import lombok.Data;
@Data
public class DeleteStPrintTempRequest {
private String printCodeIdFk;
private String stockOrderFk;
private Integer id;
private String genKey;
}

@ -23,4 +23,7 @@ public class FilterInvProductDetailRequest extends ListPageRequest {
private String stockIdFk;
private String supId;
private String originCode;
private String invStorageCode;
private String invWarehouseCode;
}

@ -6,19 +6,32 @@ import lombok.Data;
@Data
public class FilterInvProductRequest extends ListPageRequest {
private String id;
//产品名称
private String cpmctymc;
//产品标识DI
private String nameCode;
private String relIdFk;
//规格型号
private String ggxh;
//批次号
private String batchNo;
private String productionDate;
private String expireDate;
//生产厂家
private String ylqxzcrbarmc;
//批准文号
private String zczbhhzbapzbh;
private String customerId;
private String productsName;
private String supId;
//供应商名称
private String unitFk;
//仓位码
private String invStorageCode;
//货位码
private String invWarehouseCode;
private String groupType;
}

@ -16,4 +16,9 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
private Boolean isDefault;
private Date updateTime;
private String key;
private Integer level;
private String pcode;
private Integer userId;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterStPrintTempRequest extends ListPageRequest {
private Integer id;
private Integer printCodeIdFk;
private Integer stockOrderFk;
}

@ -0,0 +1,10 @@
package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
@Data
public class PdfPrintCountEntity {
private String queryId;
private Integer rowCount;
}

@ -2,6 +2,8 @@ package com.glxp.api.admin.req.itextpdf;
import lombok.Data;
import java.util.List;
@Data
public class StockQRCodeTextPDFTemplateRequest {
@ -16,4 +18,10 @@ public class StockQRCodeTextPDFTemplateRequest {
private String path;
private int rowCount;
private int qrcodeCount;
private String queryId;
private List<PdfPrintCountEntity> countList;
private String orderName;
}

@ -16,4 +16,10 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
private Boolean advanceType;
private String type;
private Integer index;
private Boolean spUse;
private String localAction;
private Boolean secCheckEnable;
private String filterAction;
}

@ -30,6 +30,7 @@ public class BussinessTypResponse {
private boolean checkChange;
private boolean checkSp;
private boolean secCheckEnable;
private boolean secCheckUdims;
private boolean secCheckPdaEd;
private boolean secCheckPdaUn;

@ -52,6 +52,11 @@ public class UdiRelevanceResponse {
private String mainId;
private String mainName;
private Boolean isSelect;
private Boolean isLock;
private Integer lockStatus;
private String udplatCode;
private Boolean isAdavence;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

@ -2,6 +2,8 @@ package com.glxp.api.admin.res.business;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderDetailResponse {
@ -20,4 +22,17 @@ public class StockOrderDetailResponse {
private String sweepCount;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
//销售清单号(第二票)
private String secSalesListNo;
//销售发票号(第一票)
private String firstSalesInvNo;
//销售发票号(第二票)
private String secSalesInvNo;
//开票日期
private String invoiceDate;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.res.inout;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import lombok.Data;
@Data
public class StockOrderResponse extends StockOrderEntity {
private boolean enableSupplementOrder;
}

@ -16,4 +16,5 @@ public class WarehouseResponse {
private long id;
private String fromCorp;
private Integer count;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.res.inventory;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import lombok.Data;
import java.util.List;
@Data
public class InvWarehouseExportResponse {
List<InvWarehouseEntity> invWarehouseEntities;
}

@ -18,7 +18,8 @@ public class InvWarehouseResponse {
private Integer status;
private Date updateTime;
private String remark;
private Integer level;
private String pcode;
private List<InvWarehouseResponse> children;
}

@ -24,4 +24,10 @@ public interface AuthAdminService {
boolean deleteById(Long id);
/**
*
*
* @return
*/
List<AuthAdmin> getHospitalUserList();
}

@ -0,0 +1,36 @@
package com.glxp.api.admin.service.auth;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.common.enums.ResultEnum;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Service
public class CustomerService {
@Resource
private AuthAdminService authAdminService;
public AuthAdmin getUserBean() {
Integer userId = getUserId();
AuthAdmin authAdmin = authAdminService.findById(userId.longValue());
return authAdmin;
}
public Integer getUserId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
return Integer.parseInt(userId);
}
}

@ -1,5 +1,6 @@
package com.glxp.api.admin.service.auth.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.auth.AuthAdminDao;
import com.glxp.api.admin.exception.JsonException;
@ -105,6 +106,13 @@ public class AuthAdminServiceImpl implements AuthAdminService {
public boolean deleteById(Long id) {
return authAdminDao.deleteById(id);
}
@Override
public List<AuthAdmin> getHospitalUserList() {
List<AuthAdmin> userList = authAdminDao.selectHospitalUser();
if (CollUtil.isEmpty(userList)) {
return Collections.emptyList();
}
return userList;
}
}

@ -17,6 +17,8 @@ public interface BussinessChangeTypeService {
boolean insertBusChangeTypee(BussinessChangeTypeEntity bussinessTypeEntity);
boolean deleteByAction(String scAction);
boolean deleteById(String id);
}

@ -15,6 +15,11 @@ public interface BussinessLocalTypeService {
List<BussinessLocalTypeEntity> filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest);
BussinessLocalTypeEntity findBTByAction(String action);
BussinessLocalTypeEntity findBTByName(String name);

@ -30,4 +30,15 @@ public interface BussinessTypeService {
boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean deleteById(String id);
List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest);
/**
*
*
* @param id
* @return
*/
List<BussinessTypeEntity> candidateBussinessType(String id);
}

@ -1,6 +1,7 @@
package com.glxp.api.admin.service.basic;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
import org.apache.ibatis.annotations.Param;
@ -12,6 +13,8 @@ public interface UdiInfoService {
List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findByNameCode(String nameCode);
UdiInfoEntity findByUuid(String uuid);

@ -19,6 +19,8 @@ public interface UdiRelevanceService {
boolean isExit();
List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids);
List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest);
boolean isExitByUuid(String uuid);

@ -44,6 +44,11 @@ public class BussinessChangeTypeServiceaImpl implements BussinessChangeTypeServi
return bussinessChangeTypeDao.insertBusChangeTypee(bussinessTypeEntity);
}
@Override
public boolean deleteByAction(String scAction) {
return bussinessChangeTypeDao.deleteByAction(scAction);
}
@Override
public boolean deleteById(String id) {
return bussinessChangeTypeDao.deleteById(id);

@ -55,6 +55,32 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return data;
}
@Override
public List<BussinessLocalTypeEntity> filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterJoinByUser(bussinessTypeFilterRequest);
return data;
}
@Override
public List<BussinessLocalTypeEntity> filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterLeftJoin(bussinessTypeFilterRequest);
return data;
}
@Override
public BussinessLocalTypeEntity findBTByAction(String action) {
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();

@ -1,6 +1,8 @@
package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.constant.ConstantType;
import com.glxp.api.admin.dao.basic.BussinessTypeDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
@ -132,6 +134,20 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
@Override
public boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity) {
if (StrUtil.isEmpty(bussinessTypeEntity.getSupplementOrderType())) {
BussinessTypeEntity temp = bussinessTypeDao.selectByAction(bussinessTypeEntity.getAction());
BussinessTypeEntity bussinessTypeEntity1 = bussinessTypeDao.selectByAction(temp.getSupplementOrderType());
if (bussinessTypeEntity1 != null) {
bussinessTypeEntity1.setSupplementOrderType("");
bussinessTypeDao.updateBussinessType(bussinessTypeEntity1);
}
} else {
BussinessTypeEntity correspondType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
if (correspondType != null && correspondType.getCorpType() == 1) {
bussinessTypeDao.updateSupplementOrderType(bussinessTypeEntity.getSupplementOrderType(), bussinessTypeEntity.getAction());
}
}
return bussinessTypeDao.updateBussinessType(bussinessTypeEntity);
}
@ -139,4 +155,29 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
public boolean deleteById(String id) {
return bussinessTypeDao.deleteById(id);
}
@Override
public List<BussinessTypeEntity> filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
if (bussinessTypeFilterRequest == null) {
return Collections.emptyList();
}
if (bussinessTypeFilterRequest.getPage() != null) {
int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
}
List<BussinessTypeEntity> data = bussinessTypeDao.filterAllByUser(bussinessTypeFilterRequest);
return data;
}
@Override
public List<BussinessTypeEntity> candidateBussinessType(String mainAction) {
// BussinessTypeEntity rawData = bussinessTypeDao.selectById(id);
// String mainAction;
if (mainAction.equals(ConstantType.TYPE_OUT)) {
mainAction = ConstantType.TYPE_PUT;
} else {
mainAction = ConstantType.TYPE_OUT;
}
return bussinessTypeDao.selectCandidateBussinsessTypes(mainAction);
}
}

@ -36,6 +36,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return data;
}
@Override
public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
return udiRelevanceDao.batchSelectByUuid(uuids);
}
@Override
public UdiRelevanceResponse selectByNameCode(String nameCode) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();

@ -24,4 +24,6 @@ public interface StockOrderDetailService {
boolean deleteByOrderIdFk(String id);
StockOrderDetailEntity findOne(@Param("id") String id);
}

@ -45,4 +45,13 @@ public interface StockOrderService {
* @return
*/
List<StockOrderExportResponse> exportOrderData(StockOrderFilterRequest request);
/**
*
*
* @return
*/
List<StockOrderEntity> getSupplementOrderBillNoList();
}

@ -140,4 +140,9 @@ public class StockOrderServiceImpl implements StockOrderService {
return Collections.emptyList();
}
@Override
public List<StockOrderEntity> getSupplementOrderBillNoList() {
return stockOrderDao.selectSupplementOrderList();
}
}

@ -41,4 +41,8 @@ public interface CodesService {
boolean updateSupId(String sup, String nameCode, String orderId);
boolean deleteByOrderId(String orderId);
}

@ -40,4 +40,6 @@ public interface OrderDetailService {
boolean deleteByOrderId(String id);
ErpOrderEntity findById(String id);
}

@ -1,9 +1,12 @@
package com.glxp.api.admin.service.inout;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.OrderQueryRequest;
import com.glxp.api.admin.res.inout.StockOrderResponse;
import com.glxp.api.common.res.BaseResponse;
import java.util.List;
@ -28,7 +31,6 @@ public interface OrderService {
boolean updateExportStatus(String orderId, Integer exportStatus);
boolean updateSignStatus(String orderId, Integer signStatus);
boolean updateContrastStatus(String orderId, String contrastStatus);
@ -42,10 +44,35 @@ public interface OrderService {
OrderEntity findById(String orderId);
List<String> findCodesById(String orderId);
List<OrderEntity> filterListByOrder(List<String> orderList);
List<OrderEntity> filterListByCode(List<WarehouseEntity> warehouseEntityList);
List<OrderEntity> listOrderError(OrderQueryRequest orderQueryRequest);
boolean updateSignStatus(String orderId, Integer signStatus);
List<OrderEntity> filterListOr(OrderFilterRequest orderFilterRequest);
/**
*
*
* @param billNo
* @return
*/
BaseResponse supplementOrder(String billNo, String orderIdFk);
/**
*
*
* @param stockOrderEntityList
* @return
*/
List<StockOrderResponse> checkSupplementOrder(List<StockOrderEntity> stockOrderEntityList);
}

@ -0,0 +1,27 @@
package com.glxp.api.admin.service.inout;
import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import java.util.List;
public interface WarehouseBussinessTypeService {
/**
* code
*
* @param code
* @return
*/
List<WarehouseBussinessTypeEntity> getListByCode(String code);
/**
* -
*
* @param code
* @param bussinessTypeEntities
*/
void saveWarehouseBussinessType(String code, List<BussinessTypResponse> bussinessTypResponseList);
}

@ -0,0 +1,33 @@
package com.glxp.api.admin.service.inout;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import java.util.List;
public interface WarehouseUserService {
/**
*
*
* @param code
* @return
*/
List<WarehouseUserEntity> getListByCode(String code);
/**
*
*
* @param code
* @param userList
*/
void saveWarehouseUser(String code, List<AuthAdmin> userList);
/**
*
*
* @param id
*/
void updateDirector(Integer id);
}

@ -38,6 +38,10 @@ public class CodesServiceImpl implements CodesService {
return warehouseDao.insertWarehouses(warehouseEntities);
}
@Override
public boolean deleteByOrderId(String orderId) {
return warehouseDao.deleteByOrderId(orderId);
}
@Override
public List<WarehouseEntity> findByNo(WarehouseQueryRequest warehouseQueryRequest) {
@ -133,4 +137,5 @@ public class CodesServiceImpl implements CodesService {
public boolean updateSupId(String sup, String nameCode, String orderId) {
return warehouseDao.updateSupId(sup, nameCode, orderId);
}
}

@ -1,26 +1,52 @@
package com.glxp.api.admin.service.inout.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.basic.BussinessTypeDao;
import com.glxp.api.admin.dao.business.StockOrderDao;
import com.glxp.api.admin.dao.inout.CodesTempDao;
import com.glxp.api.admin.dao.inout.OrderDao;
import com.glxp.api.admin.dao.inout.CodesDao;
import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.OrderQueryRequest;
import com.glxp.api.admin.res.inout.StockOrderResponse;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
public class OrderServiceImpl implements OrderService {
@Resource
OrderDao orderDao;
@Resource
CodesDao warehouseDao;
BussinessTypeDao bussinessTypeDao;
@Resource
StockOrderDao stockOrderDao;
@Resource
InvWarehouseDao invWarehouseDao;
@Resource
CodesDao codesDao;
@Resource
CodesTempDao codesTempDao;
@Override
public List<OrderEntity> listOrders(OrderQueryRequest orderQueryRequest) {
@ -43,6 +69,15 @@ public class OrderServiceImpl implements OrderService {
return orderDao.updateOrder(orderEntity);
}
@Override
public List<OrderEntity> listOrderError(OrderQueryRequest orderQueryRequest) {
if (orderQueryRequest == null) {
return Collections.emptyList();
}
int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit();
PageHelper.offsetPage(offset, orderQueryRequest.getLimit());
return orderDao.listOrderError(orderQueryRequest);
}
@Override
public List<OrderEntity> listOrderRepeat(OrderQueryRequest orderQueryRequest) {
@ -79,6 +114,7 @@ public class OrderServiceImpl implements OrderService {
return orderDao.updateExportStatus(orderId, exportStatus);
}
@Override
public boolean updateSignStatus(String orderId, Integer signStatus) {
return orderDao.updateSignStatus(orderId, signStatus);
@ -96,7 +132,17 @@ public class OrderServiceImpl implements OrderService {
@Override
public List<OrderEntity> findAllOrders(OrderFilterRequest orderFilterRequest) {
return orderDao.filterNoSort(orderFilterRequest);
return orderDao.filterList(orderFilterRequest);
}
@Override
public List<OrderEntity> filterListOr(OrderFilterRequest orderFilterRequest) {
if (orderFilterRequest == null) {
return Collections.emptyList();
}
int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit();
PageHelper.offsetPage(offset, orderFilterRequest.getLimit());
return orderDao.filterListOr(orderFilterRequest);
}
@Override
@ -121,17 +167,12 @@ public class OrderServiceImpl implements OrderService {
return orderDao.findOne(orderFilterRequest);
}
@Override
public List<String> findCodesById(String orderId) {
return warehouseDao.findCodesById(orderId);
}
@Override
public List<OrderEntity> filterListByOrder(List<String> orderList) {
return orderDao.filterListByOrder(orderList);
}
@Override
public List<OrderEntity> filterListByCode(List<WarehouseEntity> warehouseEntityList) {
if (warehouseEntityList == null) {
@ -140,5 +181,92 @@ public class OrderServiceImpl implements OrderService {
return orderDao.filterListByCode(warehouseEntityList);
}
@Override
public BaseResponse supplementOrder(String billNo, String orderIdFk) {
//查询订单数据
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(orderIdFk);
OrderEntity order = orderDao.findOne(orderFilterRequest);
//查询此类型单据是否可以补单
BussinessTypeEntity bussinessTypeEntity = bussinessTypeDao.selectByAction(order.getAction());
if (StrUtil.isBlank(bussinessTypeEntity.getSupplementOrderType())) {
//此类型单据不可补单
return ResultVOUtils.error(ResultEnum.valueOf("此类型单据不可补单"));
}
OrderEntity supplementOrder = new OrderEntity();
BeanUtil.copyProperties(order, supplementOrder);
//生成补单单号
String supplementOrderNo = "SM" + CustomUtil.getId();
supplementOrder.setSupplementNo(order.getId());
supplementOrder.setId(supplementOrderNo);
//修改状态
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据
supplementOrder.setExportStatus(0); //设置导出状态为未导出
supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验
supplementOrder.setReceiveStatus(0); //设置验收状态为未验收
//修改往来单位及当前库存号
supplementOrder.setFromCorpId(order.getLocStorageCode());
supplementOrder.setLocStorageCode(order.getFromCorpId());
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());
supplementOrder.setFromCorp(name);
supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE);
BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType());
supplementOrder.setMainAction(supplementType.getMainAction());
supplementOrder.setAction(supplementType.getAction());
//复制码表
List<WarehouseEntity> codes = codesDao.findByReceiptId(order.getId());
List<WarehouseEntity> supplementCodes = new ArrayList<>();
codes.forEach(
code -> {
WarehouseEntity supplementCode = new WarehouseEntity();
BeanUtil.copyProperties(code, supplementCode);
supplementCode.setFromCorpId(supplementOrder.getFromCorpId());
supplementCode.setFromCorp(supplementOrder.getFromCorp());
supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode());
supplementCode.setOrderId(supplementOrderNo);
//查询补单设置
supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType());
supplementCode.setMainAction(supplementType.getMainAction());
supplementCode.setId(null);
supplementCodes.add(supplementCode);
}
);
//更新数据
try {
orderDao.insertOrder(supplementOrder);
//更新配货单表对应单据的补单单号
stockOrderDao.updateSupplementNoByBillNo(billNo, supplementOrderNo);
codesTempDao.insertCodesTemp(supplementCodes);
} catch (Exception e) {
log.error("补单数据插入失败");
}
return ResultVOUtils.success();
}
@Override
public List<StockOrderResponse> checkSupplementOrder(List<StockOrderEntity> stockOrderEntityList) {
if (CollUtil.isEmpty(stockOrderEntityList)) {
return Collections.emptyList();
}
List<StockOrderResponse> result = new ArrayList<>();
stockOrderEntityList.forEach(stockOrderEntity -> {
StockOrderResponse response = new StockOrderResponse();
BeanUtil.copyProperties(stockOrderEntity, response);
String supplementOrderType = bussinessTypeDao.selectEnableSupplementOrder(stockOrderEntity.getOrderIdFk());
if (StrUtil.isBlank(supplementOrderType) || StrUtil.isNotBlank(stockOrderEntity.getSupplementNo())) {
response.setEnableSupplementOrder(false);
} else {
response.setEnableSupplementOrder(true);
}
result.add(response);
});
return result;
}
}

@ -0,0 +1,49 @@
package com.glxp.api.admin.service.inout.impl;
import cn.hutool.core.collection.CollUtil;
import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao;
import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
import com.glxp.api.admin.res.basic.BussinessTypResponse;
import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Slf4j
@Service
public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessTypeService {
@Resource
private WarehouseBussinessTypeDao warehouseBussinessTypeDao;
@Override
public List<WarehouseBussinessTypeEntity> getListByCode(String code) {
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeDao.selectListByCode(code);
if (CollUtil.isEmpty(warehouseBussinessTypeEntities)) {
return Collections.emptyList();
}
return warehouseBussinessTypeEntities;
}
@Override
public void saveWarehouseBussinessType(String code, List<BussinessTypResponse> bussinessTypResponseList) {
if (CollUtil.isNotEmpty(bussinessTypResponseList)) {
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = new ArrayList<>(bussinessTypResponseList.size());
bussinessTypResponseList.forEach(bussinessTypeEntity -> {
WarehouseBussinessTypeEntity entity = new WarehouseBussinessTypeEntity();
entity.setCode(code);
entity.setAction(bussinessTypeEntity.getAction());
entity.setName(bussinessTypeEntity.getName());
warehouseBussinessTypeEntities.add(entity);
});
//删除旧数据
warehouseBussinessTypeDao.deleteByCode(code);
//加入新数据
warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities);
}
}
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save