Merge branch 'dev' into test

pro
wj 2 years ago
commit 03b98fceb6

@ -21,7 +21,7 @@ public class ResultVOUtils {
*/ */
public static BaseResponse success(Object data) { public static BaseResponse success(Object data) {
BaseResponse<Object> baseResponse = new BaseResponse<>(); BaseResponse<Object> baseResponse = new BaseResponse<>();
baseResponse.setCode(20000); baseResponse.setCode(ResultEnum.SUCCESS.getCode());
baseResponse.setMessage("success"); baseResponse.setMessage("success");
baseResponse.setData(data); baseResponse.setData(data);
return baseResponse; return baseResponse;

@ -4,6 +4,7 @@ package com.glxp.api.config;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
@ -11,13 +12,11 @@ import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
@Profile({"dev","test"})
@Configuration @Configuration
@EnableSwagger2WebMvc @EnableSwagger2WebMvc
public class Knife4jConfiguration { public class Knife4jConfiguration {
@Value("${knife4j.enable:false}")
private boolean enable;
@Bean(value = "defaultApi2") @Bean(value = "defaultApi2")
public Docket defaultApi2() { public Docket defaultApi2() {
Docket docket = new Docket(DocumentationType.SWAGGER_2) Docket docket = new Docket(DocumentationType.SWAGGER_2)
@ -26,7 +25,6 @@ public class Knife4jConfiguration {
.description("UDI管理系统后台 - APIS") .description("UDI管理系统后台 - APIS")
.version("1.0") .version("1.0")
.build()) .build())
.enable(enable)
.select() .select()
//这里指定Controller扫描包路径 //这里指定Controller扫描包路径
.apis(RequestHandlerSelectors.basePackage("com.glxp.api.controller")) .apis(RequestHandlerSelectors.basePackage("com.glxp.api.controller"))

@ -88,6 +88,13 @@ public class SysRoleController extends BaseController {
@PutMapping @PutMapping
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
public BaseResponse edit(@Validated @RequestBody SysRole role) { public BaseResponse edit(@Validated @RequestBody SysRole role) {
//把角色改成禁用的时候 如果存在关联 不能禁用
if("1".equals(role.getStatus())){
List<SysUserRole> sysUserRoles = roleService.selectUserRoleList(role.getRoleId());
if( !sysUserRoles.isEmpty()){
return ResultVOUtils.error(500, "角色已关联用户,不能禁用!");
}
}
roleService.checkRoleAllowed(role); roleService.checkRoleAllowed(role);
roleService.checkRoleDataScope(role.getRoleId()); roleService.checkRoleDataScope(role.getRoleId());
if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) { if (Constant.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {

@ -291,8 +291,13 @@ public class SysUserController extends BaseController {
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
} }
// 修改角色
userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); // 修改角色(供应商账号)
AuthAdmin byId = userService.findById(authUserSaveRequest.getId());
if("110".equals(byId.getCustomerId())){
userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
}
userService.updateAuthAdmin(authAdmin); userService.updateAuthAdmin(authAdmin);

@ -16,10 +16,7 @@ import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.*;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.basic.LockUdiRequest;
import com.glxp.api.req.basic.UdiRelevanceSaveRequest;
import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.PageSimpleResponse;
@ -52,8 +49,6 @@ import java.util.List;
@RestController @RestController
public class UdiRelevanceController extends BaseController { public class UdiRelevanceController extends BaseController {
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource @Resource
UdiRelevanceService udiRelevanceService; UdiRelevanceService udiRelevanceService;
@Resource @Resource
@ -70,6 +65,8 @@ public class UdiRelevanceController extends BaseController {
ThrDataService thrDataService; ThrDataService thrDataService;
@Resource @Resource
UdiRlSupService udiRlSupService; UdiRlSupService udiRlSupService;
@Resource
ProductInfoService productInfoService;
//手持终端下载UDI产品信息 //手持终端下载UDI产品信息
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -698,4 +695,16 @@ public class UdiRelevanceController extends BaseController {
return ResultVOUtils.success(ggxhList); return ResultVOUtils.success(ggxhList);
} }
//国家库uuid获取产品
@PostMapping("/udi/udirel/selectOriginuuid")
@Log(title = "单据管理", businessType = BusinessType.INSERT)
public BaseResponse selectOriginuuid(@RequestBody ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ProductInfoEntity> udiProductEntities = productInfoService.findAll(productInfoFilterRequest);
return ResultVOUtils.success(udiProductEntities);
}
} }

@ -1113,8 +1113,23 @@ public class IoCodeTempController extends BaseController {
if (codeTempEntity.getMyCount() <= 0) { if (codeTempEntity.getMyCount() <= 0) {
return ResultVOUtils.error(500, "数量需要大于0"); return ResultVOUtils.error(500, "数量需要大于0");
} }
IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
int count = tempEntity.getCount() - codeTempEntity.getCount();
//更新扫码详情
IoOrderDetailCodeEntity orderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(codeTempEntity.getOrderId(), codeTempEntity.getRelId(), codeTempEntity.getBatchNo());
if (orderDetailCodeEntity != null) {
//扫码数量-1
int orderCount = orderDetailCodeEntity.getCount();
orderDetailCodeEntity.setCount(orderCount - count);
orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
ioOrderDetailCodeService.update(orderDetailCodeEntity);
}
int b = codeTempService.updateById(codeTempEntity); int b = codeTempService.updateById(codeTempEntity);
if (b > 0) if (b > 0)
return ResultVOUtils.success("修改成功"); return ResultVOUtils.success("修改成功");
else return ResultVOUtils.error(500, "修改失败!"); else return ResultVOUtils.error(500, "修改失败!");

@ -432,6 +432,9 @@ public class IoOrderDetailBizController extends BaseController {
purOrderEntity = purOrderService.selectById(purOrderEntity.getId()); purOrderEntity = purOrderService.selectById(purOrderEntity.getId());
List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(purOrderEntity.getBillType()); BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(purOrderEntity.getBillType());
if (basicBusTypeChangeEntity == null) {
return ResultVOUtils.error(500, "采购订单未配置转换单据类型!");
}
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction()); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction());
AuthAdmin authAdmin = getUser(); AuthAdmin authAdmin = getUser();
@ -593,10 +596,28 @@ public class IoOrderDetailBizController extends BaseController {
@PostMapping("/udiwms/inout/biz/updateById") @PostMapping("/udiwms/inout/biz/updateById")
@Log(title = "发票管理", businessType = BusinessType.UPDATE) @Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) { public BaseResponse updateById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderInvoiceRequest.getOrderIdFk());
if (orderEntity != null) {
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
}
return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest)); return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest));
}
@PostMapping("/udiwms/inout/bizDetail/updateById")
@Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBizById(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderDetailBizEntity.getOrderIdFk());
if (orderEntity != null) {
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
}
ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getFilePath());
ioOrderDetailBizEntity.setCheckColdFileName(ioOrderDetailBizEntity.getColdFilePath());
boolean b = orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
return ResultVOUtils.success("修改成功!");
} }
@ -664,7 +685,8 @@ public class IoOrderDetailBizController extends BaseController {
String msg = ""; String msg = "";
IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest(); IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk()); ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());
ioOrderInvoiceEntity.setBizIdFk(ioOrderDetailCodeRespons.getId()); ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk().toString());
List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity); List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceEntity);
for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) { for (IoOrderInvoiceEntity obj : ioOrderInvoiceEntityList) {
if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) { if (StrUtil.isNotEmpty(obj.getInvoiceEncode())) {

@ -2,6 +2,7 @@ package com.glxp.api.controller.inout;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
@ -13,19 +14,36 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.FilterCodeRequest;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoCodeResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.*;
import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.util.JasperUtils;
import net.sf.jasperreports.engine.JRException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping; 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.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* *
@ -40,6 +58,12 @@ public class IoOrderDetailResultController extends BaseController {
IBasicBussinessTypeService basicBussinessTypeService; IBasicBussinessTypeService basicBussinessTypeService;
@Resource @Resource
IoCodeService codeService; IoCodeService codeService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Value("${file_path}")
private String filePath;
/** /**
* *
@ -140,4 +164,96 @@ public class IoOrderDetailResultController extends BaseController {
return ResultVOUtils.success(orderDetailBizEntities); return ResultVOUtils.success(orderDetailBizEntities);
} }
//校验模板是否正确
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/order/result/file")
public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) {
//查询模板文件是否存在
SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getId());
if (null == sysPdfTemplateRelevanceStatemenEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
}
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()));
if (null == systemPDFTemplateEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
}
return ResultVOUtils.success(sysPdfTemplateRelevanceStatemenEntity.getTemplateId());
}
/**
*
*
* @param filterOrderDetailResultRequest
* @return
*/
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/resultDetail/filterOrderPrint")
public BaseResponse filterOrderPrint(@RequestBody FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException {
List<IoOrderDetailResultResponse> ioOrderDetailResultResponseList=new ArrayList<>();
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailResultRequest.getTemplateId());
//打印单号标签
Map<String, Object> data = new HashMap<>(1);
List<Object> list = new ArrayList<>();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
//按选入打印
if(filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size()>0){
ioOrderDetailResultResponseList =filterOrderDetailResultRequest.getList();
}else{
//按查询打印
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setVueType(filterOrderDetailResultRequest.getActionType());
List<String> actions = orderService.setActions(filterOrderRequest);
if (CollUtil.isEmpty(actions)) {
return ResultVOUtils.success("");
}
filterOrderDetailResultRequest.setActions(actions);
ioOrderDetailResultResponseList = orderDetailResultService.filterOrderList(filterOrderDetailResultRequest);
for (IoOrderDetailResultResponse orderDetailResultResponse : ioOrderDetailResultResponseList) {
if (orderDetailResultResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
orderDetailResultResponse.setOutCount(orderDetailResultResponse.getReCount());
orderDetailResultResponse.setInCount(0);
} else {
orderDetailResultResponse.setOutCount(0);
orderDetailResultResponse.setInCount(orderDetailResultResponse.getReCount());
}
}
}
int i=1;
for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) {
//组装数据
Map<String, Object> ioOrderDetailResultData = new HashMap<>();
ioOrderDetailResultData.put("index", String.valueOf(i));
ioOrderDetailResultData.put("nameCode", ioOrderDetailResultResponse.getNameCode() == null ? ' ' : ioOrderDetailResultResponse.getNameCode());
ioOrderDetailResultData.put("batchNo", ioOrderDetailResultResponse.getBatchNo() == null ? ' ' : ioOrderDetailResultResponse.getBatchNo());
ioOrderDetailResultData.put("productDate", ioOrderDetailResultResponse.getProductDate() == null ? ' ' : ioOrderDetailResultResponse.getProductDate());
ioOrderDetailResultData.put("expireDate", ioOrderDetailResultResponse.getExpireDate() == null ? ' ' : ioOrderDetailResultResponse.getExpireDate());
ioOrderDetailResultData.put("coName", ioOrderDetailResultResponse.getCoName() == null ? ' ' : ioOrderDetailResultResponse.getCoName());
ioOrderDetailResultData.put("certCode", ioOrderDetailResultResponse.getCertCode() == null ? ' ' : ioOrderDetailResultResponse.getCertCode());
ioOrderDetailResultData.put("ylqxzcrbarmc", ioOrderDetailResultResponse.getYlqxzcrbarmc() == null ? ' ' : ioOrderDetailResultResponse.getYlqxzcrbarmc());
ioOrderDetailResultData.put("manufacturer", ioOrderDetailResultResponse.getManufacturer() == null ? ' ' : ioOrderDetailResultResponse.getManufacturer());
ioOrderDetailResultData.put("measname", ioOrderDetailResultResponse.getMeasname() == null ? ' ' : ioOrderDetailResultResponse.getMeasname());
ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec());
ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice());
ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount());
ioOrderDetailResultData.put("reCount",ioOrderDetailResultResponse.getReCount());
ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount());
ioOrderDetailResultData.put("acceptCount", ioOrderDetailResultResponse.getAcceptCount());
ioOrderDetailResultData.put("fromCorpName", ioOrderDetailResultResponse.getFromCorpName() == null ? ' ' : ioOrderDetailResultResponse.getFromCorpName());
ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName());
ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction());
ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime()));
list.add(ioOrderDetailResultData);
i++;
}
String param = JSON.toJSONString(list);
JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
return ResultVOUtils.success();
}
} }

@ -6,9 +6,12 @@ import com.glxp.api.annotation.Log;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.req.inout.IoOrderInvoiceRequest;
import com.glxp.api.req.inout.RefreshInoiceRequest; import com.glxp.api.req.inout.RefreshInoiceRequest;
import com.glxp.api.res.inout.RefreshInoiceResponse;
import com.glxp.api.service.inout.IoOrderDetailCodeService;
import com.glxp.api.service.inout.IoOrderInvoiceService; import com.glxp.api.service.inout.IoOrderInvoiceService;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -22,7 +25,8 @@ import java.util.List;
public class IoOrderInvoiceController { public class IoOrderInvoiceController {
@Resource @Resource
IoOrderInvoiceService ioOrderInvoiceService; IoOrderInvoiceService ioOrderInvoiceService;
RefreshInoiceRequest refreshInoiceRequest; @Resource
IoOrderDetailCodeService orderDetailCodeService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -32,9 +36,14 @@ public class IoOrderInvoiceController {
IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest(); IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest();
BeanUtils.copyProperties(refreshInoiceRequest, orderInvoiceRequest); BeanUtils.copyProperties(refreshInoiceRequest, orderInvoiceRequest);
List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.selectOrderInvoice(orderInvoiceRequest); List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceService.findByBillNo(orderInvoiceRequest.getOrderIdFk());
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderInvoiceRequest.getOrderIdFk());
RefreshInoiceResponse response = new RefreshInoiceResponse();
response.setOrderInvoiceEntities(orderInvoiceEntities);
response.setOrderDetailCodeEntities(orderDetailCodeEntities);
if (CollUtil.isEmpty(orderInvoiceEntities)) if (CollUtil.isEmpty(orderInvoiceEntities))
return ResultVOUtils.error(500, "查无发票信息!"); return ResultVOUtils.error(500, "查无发票信息!");
return ResultVOUtils.success(orderInvoiceEntities); return ResultVOUtils.success(response);
} }
} }

@ -33,10 +33,7 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.*;
import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SpsSyncDownloadService;
import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.CustomUtil; import com.glxp.api.util.*;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import com.glxp.api.util.RedisUtil;
import com.glxp.api.util.udi.UdiCalCountUtil; import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
@ -338,11 +335,11 @@ public class IoOrderReviewController extends BaseController {
for (IoCodeEntity checkOrderCodesBean : codesList) { for (IoCodeEntity checkOrderCodesBean : codesList) {
if (checkOrderCodesBean.getCode().toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) { if (checkOrderCodesBean.getCode().toUpperCase(Locale.ROOT).equals(code.toUpperCase(Locale.ROOT))) {
if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED if (checkOrderCodesBean.getStatus() == Constant.DB_CHECK_ED
&& checkOrderCodesBean.getMyCount() == checkOrderCodesBean.getScanCount()) { && IntUtil.value(checkOrderCodesBean.getReCount()) == checkOrderCodesBean.getScanCount()) {
return Constant.CHECK_REPEAT; return Constant.CHECK_REPEAT;
} }
int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode()); int curCount = checkOrderCodesBean.getScanCount() + calCountUtil.getActCount(checkOrderCodesBean.getNameCode());
if (curCount == checkOrderCodesBean.getMyCount()) { if (curCount == IntUtil.value(checkOrderCodesBean.getReCount())) {
checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED); checkOrderCodesBean.setStatus(Constant.DB_CHECK_ED);
} }
checkOrderCodesBean.setScanCount(curCount); checkOrderCodesBean.setScanCount(curCount);

@ -1,5 +1,6 @@
package com.glxp.api.controller.inv; package com.glxp.api.controller.inv;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log; import com.glxp.api.annotation.Log;
@ -12,6 +13,7 @@ import com.glxp.api.entity.inv.InnerOrderEntity;
import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest; import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
@ -62,6 +64,8 @@ public class InvInnerOrderPrintController {
private IoOrderService ioOrderService; private IoOrderService ioOrderService;
@Resource @Resource
private InnerOrderService innerOrderService; private InnerOrderService innerOrderService;
@Value("${file_path}")
private String filePath;
@GetMapping("/udiwms/innerOrderPrint/filter") @GetMapping("/udiwms/innerOrderPrint/filter")
@ -171,7 +175,7 @@ public class InvInnerOrderPrintController {
innerOrderPdfTempService.insertStockPrintTempEntity(stockPrintTempEntity); innerOrderPdfTempService.insertStockPrintTempEntity(stockPrintTempEntity);
stockPrintTempEntities.add(stockPrintTempEntity); stockPrintTempEntities.add(stockPrintTempEntity);
} }
jaspaperService.printPdfLocal(splits, stockPrintTempEntities, systemPDFTemplateEntity.getPath()); jaspaperService.printPdfLocal(splits, stockPrintTempEntities, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath());
PageInfo<InvInnerOrderPdfTempEntity> pageInfo; PageInfo<InvInnerOrderPdfTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintTempEntities); pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<InvInnerOrderPdfTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -182,7 +186,7 @@ public class InvInnerOrderPrintController {
} else { } else {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("data", printEntities); data.put("data", printEntities);
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
} }
@ -217,6 +221,94 @@ public class InvInnerOrderPrintController {
} }
//-----------打印码
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/statement/file")
public BaseResponse inspectionStockQRCodeTextPDFFromTemplateStatementFile(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
//查询模板文件是否存在
SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(inspectionPDFTemplateRequest.getLabelId()+"");
if (null == sysPdfTemplateRelevanceStatemenEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
}
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()));
if (null == systemPDFTemplateEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
}
return ResultVOUtils.success(sysPdfTemplateRelevanceStatemenEntity.getTemplateId());
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/statement/file")
public BaseResponse stockQRCodeTextPDFFromTemplateStatementFile(
@RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
SysPdfTemplateRelevanceStatemenEntity sysPdfTemplateRelevanceStatemenEntity = systemPDFModuleService.selectByStatemenId(stockQRCodeTextPDFTemplateRequest.getLabelId()+"");
if (sysPdfTemplateRelevanceStatemenEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置,请检查");
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceStatemenEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterinnerOrderprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
filterinnerOrderprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
List<InnerOrderPrintResponse> stockPrintEntities = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), InnerOrderPrintResponse);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
InnerOrderPrintResponse clone = new InnerOrderPrintResponse();
BeanUtils.copyProperties(InnerOrderPrintResponse, clone);
printEntities.add(clone);
}
} else {
printEntities.add(InnerOrderPrintResponse);
}
}
String param = JSON.toJSONString(printEntities);
JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
String orderId = "";
for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
innerOrderPrintEntity.setStatus(1);
innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId());
invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
orderId = InnerOrderPrintResponse.getId() + "";
}
//查询订单id
InvInnerOrderPrintEntity innerOrderPrintEntity = invInnerOrderPrintService.selectById(orderId);
//更新内部码状态
InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk());
if (innerOrderEntity != null) {
innerOrderEntity.setGenStatus(2);
innerOrderEntity.setId(innerOrderEntity.getId());
innerOrderService.update(innerOrderEntity);
}
IoOrderEntity ioOrderEntity = new IoOrderEntity();
ioOrderEntity.setInCodeStatus(1);
ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
ioOrderService.updateByBillNo(ioOrderEntity);
return null;
}
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) { public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
for (PdfPrintCountEntity pdfPrintCount : countList) { for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) { if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) {

@ -116,7 +116,10 @@ public class PurOrderController {
if (purOrderRequest.getStatus() == null) { if (purOrderRequest.getStatus() == null) {
purOrderRequest.setStatus(11); //查询未审核和草稿状态 purOrderRequest.setStatus(11); //查询未审核和草稿状态
} }
String customerId = customerService.getCustomerId();
if (!customerId.equals("110")) {
purOrderRequest.setSupId(customerId);
}
List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest); List<PurOrderResponse> purApplyEntities = purOrderService.queryPageList(purOrderRequest);
PageInfo<PurOrderResponse> pageInfo; PageInfo<PurOrderResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities); pageInfo = new PageInfo<>(purApplyEntities);
@ -156,7 +159,7 @@ public class PurOrderController {
purOrderEntity.setUpdateTime(new Date()); purOrderEntity.setUpdateTime(new Date());
purOrderService.update(purOrderEntity); purOrderService.update(purOrderEntity);
if(postPurOrderRequest.isAutoPurchase() && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())){ if (postPurOrderRequest.isAutoPurchase() && StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
String billNo = ""; String billNo = "";
List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + ""); List<PurOrderDetailEntity> purOrderDetailEntities = purOrderDetailService.findByOrderId(purOrderEntity.getId() + "");
@ -164,61 +167,59 @@ public class PurOrderController {
Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId));
if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true
&& StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) {
if (CollUtil.isNotEmpty(purOrderDetailEntities) && postPurOrderRequest.isAutoPurchase() == true for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) {
&& StrUtil.isNotEmpty(postPurOrderRequest.getTargetBillAction())) { //生产单据表信息
IoOrderEntity ioOrderEntity = new IoOrderEntity();
for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) { ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")));
//生产单据表信息 ioOrderEntity.setCorpOrderId(CustomUtil.getDate());
IoOrderEntity ioOrderEntity = new IoOrderEntity(); ioOrderEntity.setMainAction(ConstantType.TYPE_PUT);
ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction());
ioOrderEntity.setCorpOrderId(CustomUtil.getDate()); ioOrderEntity.setFromCorp(m.getKey());
ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); ioOrderEntity.setFromType(ConstantStatus.FROM_Order);
ioOrderEntity.setAction(postPurOrderRequest.getTargetBillAction()); ioOrderEntity.setStatus(1);
ioOrderEntity.setFromCorp(m.getKey()); ioOrderEntity.setDealStatus(1);
ioOrderEntity.setFromType(ConstantStatus.FROM_Order); ioOrderEntity.setOrderType(1);
ioOrderEntity.setStatus(1); ioOrderEntity.setCreateTime(new Date());
ioOrderEntity.setDealStatus(1); ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
ioOrderEntity.setOrderType(1); ioOrderEntity.setUpdateTime(new Date());
ioOrderEntity.setCreateTime(new Date()); ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); ioOrderEntity.setCustomerId("110");
ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode());
ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser()); ioOrderEntity.setInvCode(purOrderEntity.getInvCode());
ioOrderEntity.setCustomerId("110"); ioOrderService.insertOrder(ioOrderEntity);
ioOrderEntity.setDeptCode(purOrderEntity.getDeptCode()); billNo += ioOrderEntity.getBillNo() + ",";
ioOrderEntity.setInvCode(purOrderEntity.getInvCode()); //插入业务单表
ioOrderService.insertOrder(ioOrderEntity); for (PurOrderDetailEntity obj : m.getValue()) {
billNo += ioOrderEntity.getBillNo() + ","; BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId());
//插入业务单表 IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
for (PurOrderDetailEntity obj : m.getValue()) { ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo());
BasicProductsEntity basicProductsEntity = purOrderDetailService.selectIoOrderDetailBiz(obj.getId()); ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId()));
IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); ioOrderDetailBizEntity.setCount(obj.getCount());
ioOrderDetailBizEntity.setOrderIdFk(ioOrderEntity.getBillNo()); ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
ioOrderDetailBizEntity.setBindRlFk(Long.valueOf(obj.getProductId())); ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
ioOrderDetailBizEntity.setCount(obj.getCount()); ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid()); ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode()); ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc()); ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh()); ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc()); ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); if (basicProductsEntity.getPrice() != null) {
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname()); ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
if (basicProductsEntity.getPrice() != null) {
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
}
ioOrderDetailBizEntity.setSupId(obj.getSupId());
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
} }
ioOrderDetailBizEntity.setSupId(obj.getSupId());
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
} }
purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
purOrderService.update(purOrderEntity);
} }
purOrderEntity.setStockOrderNo(billNo.substring(0, billNo.length() - 1));
purOrderService.update(purOrderEntity);
}
} }
return ResultVOUtils.success("更新成功!"); return ResultVOUtils.success("更新成功!");
} }

@ -241,6 +241,11 @@ public class SupCertController {
supCertEntity.setUpdateTime(new Date()); supCertEntity.setUpdateTime(new Date());
supCertEntity.setStatus(0); supCertEntity.setStatus(0);
supCertEntity.setId(IdUtil.getSnowflakeNextId()); supCertEntity.setId(IdUtil.getSnowflakeNextId());
if (supCertEntity.getVailDate() != null && supCertEntity.getExpireDate() != null) {
if (supCertEntity.getVailDate().getTime() > supCertEntity.getExpireDate().getTime()) {
return ResultVOUtils.error(999, "失效期不能小于生效期!");
}
}
boolean b = supCertService.insertCompanyCert(supCertEntity); boolean b = supCertService.insertCompanyCert(supCertEntity);
return ResultVOUtils.success("成功"); return ResultVOUtils.success("成功");
} }
@ -305,7 +310,7 @@ public class SupCertController {
if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) { if (postSupCertRequest.getVailDate() != null && postSupCertRequest.getExpireDate() != null) {
if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) { if (postSupCertRequest.getVailDate().getTime() > postSupCertRequest.getExpireDate().getTime()) {
return ResultVOUtils.error(999, "生效期不能小于失效期!"); return ResultVOUtils.error(999, "失效期不能小于生效期!");
} }
} }
@ -431,7 +436,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url); supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData); list.add(supData);
i++; i++;
} }
@ -440,7 +445,7 @@ public class SupCertController {
} }
String param = JSON.toJSONString(list); String param = JSON.toJSONString(list);
JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
} }
/** /**
@ -547,7 +552,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url); supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData); list.add(supData);
i++; i++;
} }
@ -555,7 +560,7 @@ public class SupCertController {
} }
String param = JSON.toJSONString(list); String param = JSON.toJSONString(list);
JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
} }
/** /**
@ -613,7 +618,7 @@ public class SupCertController {
supData.put("status", obj.getStatus() == 0 ? "有效" : "失效"); supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
supData.put("auditStatus", getAuditStatus(obj.getAuditStatus())); supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark()); supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
supData.put("filePath", filePath + "register/file/image2/" + url); supData.put("filePath", filePath + "register/image2/" + url);
list.add(supData); list.add(supData);
i++; i++;
} }
@ -621,7 +626,7 @@ public class SupCertController {
} }
String param = JSON.toJSONString(list); String param = JSON.toJSONString(list);
JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
} }
//首营预览文件 //首营预览文件

@ -151,10 +151,11 @@ public class SpsSyncDownloadController {
@GetMapping("sps/sync/syncUdis") @GetMapping("sps/sync/syncUdis")
public BaseResponse getDiProducts(SpsSyncDataRequest spsSyncDataRequest) { public BaseResponse getDiProducts(SpsSyncDataRequest spsSyncDataRequest) {
BaseResponse<SpSyncUdiResponse> baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest); BaseResponse<SpSyncUdiResponse> baseResponse = ResultVOUtils.error(ResultEnum.NOT_NETWORK.getCode(),"");
BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_DI_PRODUCTS, 3); BasicExportStatusEntity basicExportStatusEntity = basicExportService.findByData(ConstantStatus.SYNC_DI_PRODUCTS, 3);
String logs = ""; String logs = "";
if (basicExportStatusEntity != null) { if (basicExportStatusEntity != null) {
baseResponse = spsSyncDownloadService.syncUdi(spsSyncDataRequest);
// if (CollUtil.isNotEmpty(baseResponse.getData().getProductInfoEntityList())) // if (CollUtil.isNotEmpty(baseResponse.getData().getProductInfoEntityList()))
// logs = logs + "DI信息" + baseResponse.getData().getProductInfoEntityList().size() + "条\n"; // logs = logs + "DI信息" + baseResponse.getData().getProductInfoEntityList().size() + "条\n";
// if (CollUtil.isNotEmpty(baseResponse.getData().getUdiCompanyEntities())) // if (CollUtil.isNotEmpty(baseResponse.getData().getUdiCompanyEntities()))
@ -165,6 +166,8 @@ public class SpsSyncDownloadController {
SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData(); SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData();
spSyncUdiResponse.setTaskId(basicExportStatusEntity.getId()); spSyncUdiResponse.setTaskId(basicExportStatusEntity.getId());
baseResponse.setData(spSyncUdiResponse); baseResponse.setData(spSyncUdiResponse);
baseResponse.setCode(20000);
baseResponse.setMessage("success");
} }
return baseResponse; return baseResponse;
} }
@ -652,12 +655,10 @@ public class SpsSyncDownloadController {
orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange()); orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange());
} }
} }
IoOrderEntity temp = orderService.findById(orderEntity.getBillNo()); IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
if (temp == null) { if (temp == null) {
// 过滤使用出库单,转换成一级库出库单(条件:往来类型为客户信息,出入库类型为出库,仓库类型为入账库,是否更改库存为是 //过滤使用出库单,转换成一级库出库单(条件:往来类型为客户信息,出入库类型为出库,仓库类型为入账库,是否更改库存为是
BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (basicBussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT if (basicBussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT
&& basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)
@ -694,7 +695,6 @@ public class SpsSyncDownloadController {
List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities(); List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();
for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
bizEntity.setId(null);
orderDetailBizDao.insert(bizEntity); orderDetailBizDao.insert(bizEntity);
} }
} }
@ -705,7 +705,6 @@ public class SpsSyncDownloadController {
List<IoOrderDetailCodeEntity> orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities(); List<IoOrderDetailCodeEntity> orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities();
for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
codeEntity.setId(null);
orderDetailCodeDao.insert(codeEntity); orderDetailCodeDao.insert(codeEntity);
} }
} }
@ -798,7 +797,6 @@ public class SpsSyncDownloadController {
orderEntity.setUpdateTime(null); orderEntity.setUpdateTime(null);
PurOrderEntity temp = purOrderService.selectByBillNo(orderEntity.getBillNo()); PurOrderEntity temp = purOrderService.selectByBillNo(orderEntity.getBillNo());
if (temp == null) { if (temp == null) {
orderEntity.setId(null);
purOrderService.insert(orderEntity); purOrderService.insert(orderEntity);
if (CollUtil.isNotEmpty(spsSyncBusOrderResponse.getPurOrderDetailEntities())) { if (CollUtil.isNotEmpty(spsSyncBusOrderResponse.getPurOrderDetailEntities())) {
List<PurOrderDetailEntity> purOrderDetailEntities = spsSyncBusOrderResponse.getPurOrderDetailEntities(); List<PurOrderDetailEntity> purOrderDetailEntities = spsSyncBusOrderResponse.getPurOrderDetailEntities();

@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -189,6 +190,9 @@ public class SysParamConfigController {
filterParamConfigRequest.setParamType(2); filterParamConfigRequest.setParamType(2);
filterParamConfigRequest.setParamStatus(1); filterParamConfigRequest.setParamStatus(1);
List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest); List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest);
systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getParamKey))
.collect(Collectors.toList());
ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity(); ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity();
if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) { if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) {

@ -73,10 +73,10 @@ public class SysPdfTemplateController {
SystemPDFTemplateEntity systemPDFTemplateEntity = SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(filterPdfTemplateRequest.getId())); systemPDFTemplateService.selectById(String.valueOf(filterPdfTemplateRequest.getId()));
String data = ""; String data = "";
if (systemPDFTemplateEntity.getModule() == 2) { if (systemPDFTemplateEntity.getModule() == 3) {
data = data =
"{\"data\":[{\"batchNo\":\"2020\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"1\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"},{\"batchNo\":\"2023\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"2\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"},{\"batchNo\":\"2021\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"3\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"}]}"; "{\"data\":[{\"batchNo\":\"2020\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"1\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"},{\"batchNo\":\"2023\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"2\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"},{\"batchNo\":\"2021\",\"billNo\":\"2022040811589\",\"billType\":\"ST39730635520\",\"billdate\":\"2022-04-08\",\"corpId\":\"39864007581\",\"corpName\":\"漳州**有限公司\",\"count\":\"4\",\"customerId\":\"39864007581\",\"expireDate\":\"251020\",\"id\":\"10\",\"index\":\"3\",\"locInv\":\"总库\",\"orderIdFk\":\"SM412208685600\",\"printStatus\":\"102\",\"productDate\":\"201020\",\"productId\":\"169\",\"productName\":\"一次性使用开环式微创肛肠吻合器\",\"sourceType\":\"1\",\"spec\":\"TST33-T80——2993规格\",\"status\":\"5\",\"sweepCount\":\"0\",\"title\":\"漳州**医院\",\"type\":\"2\",\"unitIdFk\":\"39864007581\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"苏械注准2022000000\",\"price\":\"10.00\"}]}";
} else if (systemPDFTemplateEntity.getModule() == 0) { } else if (systemPDFTemplateEntity.getModule() == 2) {
data = data =
"{\"data\":[{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"}]}"; "{\"data\":[{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"},{\"batchNo\":\"2021\",\"corpName\":\"漳州***医院\",\"count\":10,\"cpmctymc\":\"髋关节假体\",\"expireDate\":\"230606\",\"ggxh\":\"DTUCS Ⅱ 3#\",\"id\":4,\"nameCode\":\"06902139302144\",\"produceDate\":\"210606\",\"udiCode\":\"#06902139302144#210606#230606#2021###\",\"ylqxzcrbarmc\":\"漳州**有限公司\",\"zczbhhzbapzbh\":\"国械注准201000000000\"}]}";
} else if (systemPDFTemplateEntity.getModule() == 1) { } else if (systemPDFTemplateEntity.getModule() == 1) {

@ -19,4 +19,6 @@ public interface SysUserRoleMapper {
SysUserRole selectByAuthId(Long id); SysUserRole selectByAuthId(Long id);
List<SysUserRole> selectUserRoleList(Long roleId);
} }

@ -1,6 +1,7 @@
package com.glxp.api.dao.sync; package com.glxp.api.dao.sync;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.req.sync.BasicExportTimeRequest;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface BasicExportTimeDao extends BaseMapper<BasicExportStatusTimeEntity> { public interface BasicExportTimeDao extends BaseMapperPlus<BasicExportTimeDao, BasicExportStatusTimeEntity, BasicExportStatusTimeEntity> {
List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); List<BasicExportStatusTimeEntity> filterExportStatus(BasicExportTimeRequest basicExportStatusRequest);

@ -85,6 +85,8 @@ public class UdiProductEntity {
private Long relSupId; private Long relSupId;
private Boolean groupBuy;
public Boolean getAllowNoBatch() { public Boolean getAllowNoBatch() {
if (allowNoBatch == null) if (allowNoBatch == null)

@ -180,12 +180,23 @@ public class IoOrderDetailBizEntity {
@TableField(value = "filePath") @TableField(value = "filePath")
private String filePath; private String filePath;
@TableField(value = "coldFilePath")
private String coldFilePath;
/** /**
* *
*/ */
@TableField(value = "checkFileName") @TableField(value = "checkFileName")
private String checkFileName; private String checkFileName;
/**
*
*/
@TableField(value = "checkColdFileName")
private String checkColdFileName;
@TableField(exist = false) @TableField(exist = false)
private boolean checkSuccess; private boolean checkSuccess;

@ -1,5 +1,6 @@
package com.glxp.api.req.inout; package com.glxp.api.req.inout;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.util.page.ListPageRequest;
import lombok.Data; import lombok.Data;
@ -43,7 +44,9 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
private String endAduditTime; //结束日期 private String endAduditTime; //结束日期
private String fromCorp; private String fromCorp;
private String actionType; private String actionType;
private String templateId;
private String manufacturer; private String manufacturer;
private String zczbhhzbapzbh; private String zczbhhzbapzbh;
private List<String> actions; private List<String> actions;
private List<IoOrderDetailResultResponse> list;
} }

@ -12,7 +12,7 @@ import java.util.Date;
public class IoCodeLostRequest extends ListPageRequest { public class IoCodeLostRequest extends ListPageRequest {
private Integer id; private Long id;
/** /**
* UDI * UDI

@ -81,6 +81,7 @@ public class PurOrderRequest extends ListPageRequest {
private Date auditTime; private Date auditTime;
private String createUser; private String createUser;
private String supId;
/** /**
* *

@ -92,4 +92,6 @@ public class UdiRlSupResponse {
//产品id //产品id
private String PRId; private String PRId;
private String classifyName; private String classifyName;
private boolean groupBuy; //是否集采产品
} }

@ -15,7 +15,7 @@ import java.util.Date;
@Data @Data
public class IoCodeLostResponse { public class IoCodeLostResponse {
private Integer id; private Long id;
private String code; private String code;

@ -169,6 +169,10 @@ public class IoOrderDetailBizResponse {
private String invoiceCode; private String invoiceCode;
private String coldFilePath;
private String checkColdFileName;
} }

@ -3,6 +3,7 @@ package com.glxp.api.res.inout;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* VO * VO
@ -159,6 +160,7 @@ public class IoOrderDetailResultResponse {
private String fromCorpName; private String fromCorpName;
private String billTypeName; private String billTypeName;
private String mainAction; private String mainAction;
private Date auditTime;
} }

@ -0,0 +1,14 @@
package com.glxp.api.res.inout;
import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
import lombok.Data;
import java.util.List;
@Data
public class RefreshInoiceResponse {
List<IoOrderInvoiceEntity> orderInvoiceEntities;
List<IoOrderDetailCodeEntity> orderDetailCodeEntities;
}

@ -11,7 +11,7 @@ public class PurOrderResponse {
/** /**
* *
*/ */
private Integer id; private Long id;
/** /**
* *
*/ */

@ -0,0 +1,12 @@
package com.glxp.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
public interface CustomService<T> extends IService<T> {
int insertIgnore(T entity);
int insertIgnoreBatch(List<T> entityList);
int replace(T entity);
int replaceBatch(List<T> entityList);
}

@ -0,0 +1,29 @@
package com.glxp.api.service;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.BaseMapperPlus;
import java.util.List;
public class CustomServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<BaseMapperPlus<M,T,T>, T> implements CustomService<T>{
@Override
public int insertIgnore(T entity) {
return baseMapper.insertIgnore(entity);
}
@Override
public int insertIgnoreBatch(List<T> entityList) {
return baseMapper.insertIgnoreBatch(entityList);
}
@Override
public int replace(T entity) {
return baseMapper.replace(entity);
}
@Override
public int replaceBatch(List<T> entityList) {
return baseMapper.replaceBatch(entityList);
}
}

@ -85,6 +85,8 @@ public interface ISysRoleService {
*/ */
void checkRoleAllowed(SysRole role); void checkRoleAllowed(SysRole role);
List<SysUserRole> selectUserRoleList(Long roleId);
/** /**
* *
* *

@ -187,6 +187,11 @@ public class SysRoleServiceImpl implements ISysRoleService {
} }
} }
@Override
public List<SysUserRole> selectUserRoleList(Long roleId) {
return sysUserRoleMapper.selectUserRoleList(roleId);
}
/** /**
* *
* *

@ -285,7 +285,7 @@ public class IoOrderServiceImpl implements IoOrderService {
//查询条码 //查询条码
IoOrderEntity orderEntity = findByBillNo(billNo); IoOrderEntity orderEntity = findByBillNo(billNo);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED
|| orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS || orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
//更新正式表 //更新正式表
IoCodeEntity ioCodeEntity = codeService.findByUnique(billNo, code); IoCodeEntity ioCodeEntity = codeService.findByUnique(billNo, code);
if (ioCodeEntity.getMyCount() > 1) { if (ioCodeEntity.getMyCount() > 1) {

@ -1,5 +1,6 @@
package com.glxp.api.service.purchase.impl; package com.glxp.api.service.purchase.impl;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.purchase.PurOrderDao; import com.glxp.api.dao.purchase.PurOrderDao;
@ -54,6 +55,8 @@ public class PurOrderServiceImpl implements PurOrderService {
@Override @Override
public Boolean insert(PurOrderEntity purOrderEntity) { public Boolean insert(PurOrderEntity purOrderEntity) {
if (purOrderEntity.getId() == null)
purOrderEntity.setId(IdUtil.getSnowflakeNextId());
return purOrderDao.insert(purOrderEntity) > 0 ? true : false; return purOrderDao.insert(purOrderEntity) > 0 ? true : false;
} }

@ -1,13 +1,16 @@
package com.glxp.api.service.sync; package com.glxp.api.service.sync;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.req.sync.BasicExportTimeRequest;
import com.glxp.api.service.CustomService;
import java.util.List; import java.util.List;
public interface BasicExportTimeService extends IService<BasicExportStatusTimeEntity> { public interface BasicExportTimeService extends CustomService<BasicExportStatusTimeEntity> {
BasicExportStatusTimeEntity findByType(String type); BasicExportStatusTimeEntity findByType(String type);

@ -40,6 +40,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.File; import java.io.File;
@ -132,6 +133,7 @@ public class SpsSyncDownloadService {
} }
} }
@Transactional
// 创建国家库同步任务 // 创建国家库同步任务
public void syncDiProductsTask(Date lastUpdateTime) { public void syncDiProductsTask(Date lastUpdateTime) {
@ -144,8 +146,16 @@ public class SpsSyncDownloadService {
//首次任务or上次任务结束 //首次任务or上次任务结束
if (exportStatus == null || BasicExportStatusEnum.COMPLETED.getCode().equals(exportStatus.getStatus())) { if (exportStatus == null || BasicExportStatusEnum.COMPLETED.getCode().equals(exportStatus.getStatus())) {
SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DI_PRODUCTS); SpsSyncDataRequest spsSyncDataRequest = getRequest(ConstantStatus.SYNC_DI_PRODUCTS);
if (lastUpdateTime != null) if (lastUpdateTime != null) {
spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime)); spsSyncDataRequest.setLastUpdateTime(DateUtil.formatDateTime(lastUpdateTime));
BasicExportStatusTimeEntity timeInfo = BasicExportStatusTimeEntity.builder()
.key("AutoDownloadDiProducts")
.lastUpdateTime(DateUtil.formatDateTime(lastUpdateTime))
.build();
basicExportTimeService.replace(timeInfo);
}
BaseResponse<SpSyncUdiResponse> baseResponse = syncUdi(spsSyncDataRequest); BaseResponse<SpSyncUdiResponse> baseResponse = syncUdi(spsSyncDataRequest);
SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData(); SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData();
if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList()) if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList())
@ -275,10 +285,10 @@ public class SpsSyncDownloadService {
.updateTime(cn.hutool.core.date.DateUtil.date()) .updateTime(cn.hutool.core.date.DateUtil.date())
.startTime(now) .startTime(now)
.build(); .build();
basicExportService.save(exportStatus);
if (syncTime != null) { if (syncTime != null) {
createFileMethod.apply(applicationContext.getBean(this.getClass())); createFileMethod.apply(applicationContext.getBean(this.getClass()));
} }
basicExportService.save(exportStatus);
} else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成 } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
createFileMethod.apply(applicationContext.getBean(this.getClass())); createFileMethod.apply(applicationContext.getBean(this.getClass()));
} }

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.sync.BasicExportTimeDao; import com.glxp.api.dao.sync.BasicExportTimeDao;
import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.req.sync.BasicExportTimeRequest;
import com.glxp.api.service.CustomServiceImpl;
import com.glxp.api.service.sync.BasicExportTimeService; import com.glxp.api.service.sync.BasicExportTimeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -15,7 +16,7 @@ import java.util.List;
@Service @Service
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public class BasicExportTimeServiceImpl extends ServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService { public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService {
@Resource @Resource
BasicExportTimeDao basicExportTimeDao; BasicExportTimeDao basicExportTimeDao;

@ -54,7 +54,7 @@ public class SupplementVailUtil {
basicProductSetEntity = basicProductSetEntityMap.get("manufactory"); basicProductSetEntity = basicProductSetEntityMap.get("manufactory");
if (isMustFill(type, basicProductSetEntity)) { if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getManufactory())) { if (StrUtil.isEmptyIfStr(supplementRequest.getManufactory())) {
return "生产厂家不能为空"; return "生产企业不能为空";
} }
} }

@ -2,6 +2,7 @@ package com.glxp.api.util.page;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.glxp.api.common.enums.ResultEnum;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@ -48,7 +49,7 @@ public class TableDataInfo<T> {
public static <T> TableDataInfo<T> build(IPage<T> page) { public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>(); TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(20000); rspData.setCode(ResultEnum.SUCCESS.getCode());
rspData.setMsg("查询成功"); rspData.setMsg("查询成功");
rspData.setList(page.getRecords()); rspData.setList(page.getRecords());
rspData.setTotal(page.getTotal()); rspData.setTotal(page.getTotal());

@ -40,7 +40,8 @@
</where> </where>
</select> </select>
<select id="filterAllByUser" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest" <!-- 如果部门下面未关联仓库 就不用拉-->
<select id="filterAllByUser" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
resultType="com.glxp.api.entity.auth.DeptEntity"> resultType="com.glxp.api.entity.auth.DeptEntity">
select auth_dept.* from auth_dept select auth_dept.* from auth_dept
INNER JOIN auth_warehouse INNER JOIN auth_warehouse

@ -20,6 +20,13 @@
where user_id=#{id} where user_id=#{id}
</select> </select>
<select id="selectUserRoleList" resultMap="SysUserRoleResult">
select *
from auth_user_role
where role_id = #{roleId}
</select>
<delete id="delete" parameterType="com.glxp.api.req.auth.FilterUserRoleRequest"> <delete id="delete" parameterType="com.glxp.api.req.auth.FilterUserRoleRequest">
DELETE DELETE

@ -126,6 +126,9 @@
<if test="corpType != null"> <if test="corpType != null">
AND bu.corpType = #{corpType} AND bu.corpType = #{corpType}
</if> </if>
<if test="actionType != null">
AND bu.actionType = #{actionType}
</if>
<if test="sortNum != null"> <if test="sortNum != null">
AND bu.sortNum = #{sortNum} AND bu.sortNum = #{sortNum}
</if> </if>

@ -793,6 +793,9 @@
<if test="updateTime != null"> <if test="updateTime != null">
updateTime=#{updateTime}, updateTime=#{updateTime},
</if> </if>
<if test="groupBuy != null">
groupBuy=#{groupBuy},
</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

@ -305,7 +305,8 @@
basic_products.basicPrductRemak5, basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6, basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8 basic_products.groupBuy,
basic_products.basicPrductRemak8
FROM basic_products FROM basic_products
inner JOIN basic_udirel inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid

@ -105,6 +105,7 @@
basic_products.basicPrductRemak6, basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7, basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8, basic_products.basicPrductRemak8,
basic_products.groupBuy,
basic_corp.name companyName basic_corp.name companyName
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel

@ -51,8 +51,8 @@
<select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse"> <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT ic.*, SELECT ic.*,
(select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc, (select cpmctymc from basic_products where basic_products.uuid = bu.uuid GROUP BY basic_products.uuid) cpmctymc,
(select ggxh from basic_products where basic_products.uuid = bu.uuid) ggxh (select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY basic_products.uuid) ggxh
FROM io_order_invoice ic FROM io_order_invoice ic
LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid LEFT JOIN basic_products bp ON bu.uuid = bp.uuid

@ -12,18 +12,29 @@
<select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest" <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"> resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
select * SELECT ic.*,
from io_order_invoice (select cpmctymc
from basic_products
where basic_products.uuid = bu.uuid
GROUP BY basic_products.uuid) cpmctymc,
(select ggxh from basic_products where basic_products.uuid = bu.uuid GROUP BY basic_products.uuid) ggxh
FROM io_order_invoice ic
LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
<where> <where>
<if test="id != null"> <if test="orderIdFk != null and orderIdFk != ''">
AND id = #{id} AND ic.orderIdFk = #{orderIdFk}
</if> </if>
<if test="bizIdFk != null"> <if test="bindRlFk != null">
AND bizIdFk = #{bizIdFk} AND ic.bindRlFk = #{bindRlFk}
</if> </if>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="batchNo != null and batchNo != ''">
AND orderIdFk = #{orderIdFk} AND ic.batchNo = #{batchNo}
</if>
<if test="batchNo == null || batchNo == ''">
AND (ic.batchNo is null or ic.batchNo = '')
</if> </if>
</where> </where>
GROUP BY ic.id
</select> </select>
</mapper> </mapper>

@ -77,6 +77,7 @@
</foreach> </foreach>
</if> </if>
</where> </where>
group by ipp.id
</select> </select>
<select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreProductEntity"> <select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreProductEntity">

@ -3,32 +3,32 @@
<mapper namespace="com.glxp.api.dao.inv.InvPreinProductDao"> <mapper namespace="com.glxp.api.dao.inv.InvPreinProductDao">
<select id="filterList" resultType="com.glxp.api.res.inv.InvPreinProductResponse"> <select id="filterList" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
select ipp.id, select ipp.id,
ipp.nameCode, ipp.nameCode,
bp.cpmctymc, bp.cpmctymc,
ipp.relIdFk, ipp.relIdFk,
bp.ggxh, bp.ggxh,
ipp.batchNo, ipp.batchNo,
ipp.productionDate, ipp.productionDate,
ipp.expireDate, ipp.expireDate,
bp.ylqxzcrbarmc, bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh, bp.zczbhhzbapzbh,
ipp.inCount, ipp.inCount,
ipp.outCount, ipp.outCount,
ipp.reCount, ipp.reCount,
ipp.customerId, ipp.customerId,
basic_corp.name supName, basic_corp.name supName,
ipp.supId, ipp.supId,
auth_dept.name deptName, auth_dept.name deptName,
auth_warehouse.name invName, auth_warehouse.name invName,
ipp.deptCode, ipp.deptCode,
ipp.invCode, ipp.invCode,
bp.measname bp.measname
from inv_prein_product ipp from inv_prein_product ipp
inner join basic_udirel on ipp.relIdFk = basic_udirel.id inner join basic_udirel on ipp.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ipp.supId = basic_corp.erpId left join basic_corp on ipp.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ipp.deptCode left join auth_dept on auth_dept.code = ipp.deptCode
left join auth_warehouse on auth_warehouse.code = ipp.invCode left join auth_warehouse on auth_warehouse.code = ipp.invCode
<where> <where>
<if test="cpmctymc != null and cpmctymc != ''"> <if test="cpmctymc != null and cpmctymc != ''">
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
@ -76,16 +76,17 @@
</foreach> </foreach>
</if> </if>
</where> </where>
group by ipp.id
</select> </select>
<select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreinProductEntity"> <select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreinProductEntity">
select ipp.* select ipp.*
from inv_prein_product ipp from inv_prein_product ipp
inner join basic_udirel on ipp.relIdFk = basic_udirel.id inner join basic_udirel on ipp.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ipp.supId = basic_corp.erpId left join basic_corp on ipp.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ipp.deptCode left join auth_dept on auth_dept.code = ipp.deptCode
left join auth_warehouse on auth_warehouse.code = ipp.invCode left join auth_warehouse on auth_warehouse.code = ipp.invCode
<where> <where>
bp.diType = 1 bp.diType = 1
<if test="cpmctymc != null and cpmctymc != ''"> <if test="cpmctymc != null and cpmctymc != ''">

@ -40,12 +40,15 @@
cb.employeeName createUserName, cb.employeeName createUserName,
ab.employeeName auditUserName, ab.employeeName auditUserName,
auth_warehouse.NAME invName, auth_warehouse.NAME invName,
auth_dept.`name` deptName auth_dept.`name` deptName,
basic_corp.name supName
FROM pur_order FROM pur_order
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
left join basic_corp on pur_order.supId = basic_corp.erpId
<where> <where>
<if test="billNo != '' and billNo != null"> <if test="billNo != '' and billNo != null">
AND billNo = #{billNo} AND billNo = #{billNo}
@ -92,6 +95,9 @@
<if test="auditUser != '' and auditUser != null"> <if test="auditUser != '' and auditUser != null">
AND auditUser = #{auditUser} AND auditUser = #{auditUser}
</if> </if>
<if test="supId != null and supId != ''">
AND pur_order.supId = #{supId}
</if>
<if test="createUser != '' and createUser != null"> <if test="createUser != '' and createUser != null">
AND createUser = #{createUser} AND createUser = #{createUser}
</if> </if>

@ -1,133 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.purchase.PurOrderDetailDao"> <mapper namespace="com.glxp.api.dao.purchase.PurOrderDetailDao">
<resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.purchase.PurOrderDetailEntity"> <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table pur_order_detail--> <!--@Table pur_order_detail-->
<!-- <id column="id" jdbcType="INTEGER" property="id" />--> <!-- <id column="id" jdbcType="INTEGER" property="id" />-->
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" /> <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
<result column="productId" jdbcType="INTEGER" property="productId" /> <result column="productId" jdbcType="INTEGER" property="productId"/>
<result column="productName" jdbcType="VARCHAR" property="productName" /> <result column="productName" jdbcType="VARCHAR" property="productName"/>
<result column="count" jdbcType="INTEGER" property="count" /> <result column="count" jdbcType="INTEGER" property="count"/>
<result column="supId" jdbcType="VARCHAR" property="supId" /> <result column="supId" jdbcType="VARCHAR" property="supId"/>
<result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh" /> <result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh id, orderIdFk, productId, productName, `count`, supId, zczbhhzbapzbh
</sql> </sql>
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest" <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
resultType="com.glxp.api.entity.purchase.PurOrderDetailEntity"> resultType="com.glxp.api.entity.purchase.PurOrderDetailEntity">
select * select *
FROM pur_order_detail FROM pur_order_detail
<where> <where>
<if test="orderIdFk != '' and orderIdFk != null"> <if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}
</if> </if>
<if test="productId != null"> <if test="productId != null">
AND productId = #{productId} AND productId = #{productId}
</if> </if>
<if test="supId != '' and supId != null"> <if test="supId != '' and supId != null">
AND supId = #{supId} AND supId = #{supId}
</if> </if>
</where> </where>
</select>
</select>
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest"
<select id="joinQueryList" parameterType="com.glxp.api.req.purchase.PurOrderDetailRequest" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
resultType="com.glxp.api.res.purchase.PurOrderDetailResponse"> SELECT pur_order_detail.*,
SELECT basic_products.ggxh spec,
pur_order_detail.*, basic_products.measname,
basic_products.ggxh spec, basic_products.manufactory,
basic_products.measname, basic_products.ylqxzcrbarmc,
basic_products.manufactory, basic_corp.`name` supName
basic_products.ylqxzcrbarmc, FROM pur_order_detail
basic_corp.`name` supName left JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id
FROM left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
pur_order_detail left JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId
INNER JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id <where>
INNER JOIN basic_products ON basic_udirel.uuid = basic_products.uuid <if test="orderIdFk != '' and orderIdFk != null">
INNER JOIN basic_corp ON pur_order_detail.supId = basic_corp.erpId AND orderIdFk = #{orderIdFk}
<where> AND basic_products.diType = 1
<if test="orderIdFk != '' and orderIdFk != null"> </if>
AND orderIdFk = #{orderIdFk} <if test="productId != null">
AND basic_products.diType=1 AND productId = #{productId}
</if> </if>
<if test="productId != null"> <if test="supId != '' and supId != null">
AND productId = #{productId} AND supId = #{supId}
</if> </if>
<if test="supId != '' and supId != null"> </where>
AND supId = #{supId} </select>
</if>
</where>
<delete id="deleteByIds" parameterType="java.util.List">
</select> DELETE
FROM pur_order_detail WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<delete id="deleteByIds" parameterType="java.util.List"> </delete>
DELETE FROM pur_order_detail WHERE id in
<foreach collection="ids" item="item" open="(" separator="," close=")">
#{item} <delete id="deleteByOrderId" parameterType="map">
</foreach> DELETE
</delete> FROM pur_order_detail
WHERE orderIdFk = #{orderIdFk}
</delete>
<update id="update" parameterType="com.glxp.api.entity.purchase.PurOrderDetailEntity">
<delete id="deleteByOrderId" parameterType="map"> UPDATE pur_order_detail
DELETE <trim prefix="set" suffixOverrides=",">
FROM pur_order_detail <if test="orderIdFk != null">
WHERE orderIdFk = #{orderIdFk} orderIdFk=#{orderIdFk},
</delete> </if>
<if test="productId != null">
<update id="update" parameterType="com.glxp.api.entity.purchase.PurOrderDetailEntity"> productId=#{productId},
UPDATE pur_order_detail </if>
<trim prefix="set" suffixOverrides=","> <if test="productName != null">
<if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if> productName=#{productName},
<if test="productId != null">productId=#{productId},</if> </if>
<if test="productName != null">productName=#{productName},</if> <if test="count != null">
<if test="count != null">`count`=#{count},</if> `count`=#{count},
<if test="supId != null">supId=#{supId},</if> </if>
<if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if> <if test="supId != null">
</trim> supId=#{supId},
WHERE id = #{id} </if>
</update> <if test="zczbhhzbapzbh != null">
zczbhhzbapzbh=#{zczbhhzbapzbh},
</if>
<insert id="insertPurOrderDetailEntity" keyProperty="id" parameterType="com.glxp.api.entity.purchase.PurOrderDetailEntity"> </trim>
REPLACE INTO pur_order_detail WHERE id = #{id}
( orderIdFk,productId,productName,count,supId,zczbhhzbapzbh) values </update>
<foreach collection="datas" item="item" index="index" separator=",">
( <insert id="insertPurOrderDetailEntity" keyProperty="id"
#{item.orderIdFk}, parameterType="com.glxp.api.entity.purchase.PurOrderDetailEntity">
#{item.productId}, REPLACE INTO pur_order_detail
#{item.productName}, (orderIdFk, productId, productName, count, supId, zczbhhzbapzbh) values
#{item.count},
#{item.supId}, <foreach collection="datas" item="item" index="index" separator=",">
#{item.zczbhhzbapzbh} (#{item.orderIdFk},
) #{item.productId},
</foreach> #{item.productName},
</insert> #{item.count},
#{item.supId},
<select id="selectIoOrderDetailBiz" parameterType="long" #{item.zczbhhzbapzbh})
resultType="com.glxp.api.entity.basic.BasicProductsEntity"> </foreach>
SELECT </insert>
b2.*
FROM <select id="selectIoOrderDetailBiz" parameterType="long"
pur_order_detail p1 resultType="com.glxp.api.entity.basic.BasicProductsEntity">
LEFT JOIN basic_udirel b1 on b1.id=p1.productId SELECT b2.*
LEFT JOIN basic_products b2 on b1.uuid = b2 .uuid FROM pur_order_detail p1
<where> LEFT JOIN basic_udirel b1 on b1.id = p1.productId
<if test="id != null and id!='' "> LEFT JOIN basic_products b2 on b1.uuid = b2.uuid
AND p1.id = #{id} <where>
</if> <if test="id != null and id != ''">
</where> AND p1.id = #{id}
GROUP BY uuid </if>
</select> </where>
GROUP BY uuid
</select>
</mapper> </mapper>

@ -171,7 +171,7 @@
AND tdi.uuid = #{uuid} AND tdi.uuid = #{uuid}
</if> </if>
<if test="name != '' and name != null"> <if test="name != '' and name != null">
AND tdi.name = #{name} AND tdi.name like concat('%',#{name},'%')
</if> </if>
<if test="spec != '' and spec != null"> <if test="spec != '' and spec != null">
AND tdi.spec = #{spec} AND tdi.spec = #{spec}

@ -50,6 +50,8 @@ CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint ', 1);
CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);
@ -182,6 +184,11 @@ CALL Pro_Temp_ColumnWork('sys_pdf_template', 'bussinessStatus', 'varchar(255)',
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'filePath', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1); CALL Pro_Temp_ColumnWork('io_order', 'checkStatus', 'tinyint', 1);
INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`)
@ -373,6 +380,8 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2); CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2);

Loading…
Cancel
Save