代码备份

master
anthonywj 4 years ago
parent 5f141fca95
commit 8ac49ca345

@ -84,7 +84,11 @@
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>com.glxp</groupId>
<artifactId>tochina</artifactId>
<version>1.0</version>
</dependency>
<!--<dependency>-->
<!--<groupId>com.anthony.ali</groupId>-->
<!--<artifactId>alicode</artifactId>-->
@ -237,8 +241,13 @@
<artifactId>olap4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>3.0.7</version>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
@ -302,6 +311,9 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
</plugin>
<!-- 5、添加插件指定jdk -->
<plugin>

@ -12,9 +12,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
public class ApiAdminApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(ApiAdminApplication.class, args);
SpringApplication application = new SpringApplication(ApiAdminApplication.class);
application.addInitializers(new ToolApplicationContextInitializer());
application.run(args);
// SpringApplication.run(ApiAdminApplication.class, args);
}
@Override

@ -0,0 +1,39 @@
package com.glxp.sale;
import com.glxp.sale.admin.util.HardWareUtils;
import com.glxp.sale.admin.util.RsaUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
public class ToolApplicationContextInitializer implements ApplicationContextInitializer {
@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
String myKey = RsaUtils.readFileContent("");
System.out.println(myKey);
String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtaHLiDtscnwyee4lG9jC" +
"8GUEZYIuBoz49W3GSy2LEOVpKRyiQNCjRmybvQS5qKdsb3pV720HQJnv/nQLnsg/" +
"vWbFc9L09fEeJdDZxQOf8D7CHeVgLd8+fh/GezQCVLijGlbAVORXOrFo5McdyOds" +
"LJey1x4HxIR13a79JHB7sdve14A2aS6bQ7NPWu8hM9LpJd1hylsXgdBpR+iX3DPF" +
"eep8Sx8jPnWfUfGF2pDNE3h1uz9RylGBYUz4tDPzz0IXO7vZkyUFXeslzKFDFcmh" +
"hbn1tobX+al4XvfRpjoCjST2mRfqCt4aNuBDM1LHMzyMBVJpfui91ikLGMgP4Gdf" +
"swIDAQAB";
try {
String result = RsaUtils.publicKeyDecrypt(myKey, publicKey);
System.out.println(result);
String hardInfo = HardWareUtils.getMachineInfo();
System.out.println(hardInfo);
if (!result.equals(hardInfo)) {
System.exit(1);
}
// System.out.println(hardInfo);
} catch (Exception e) {
e.printStackTrace();
System.exit(1);
}
}
}

@ -0,0 +1,26 @@
package com.glxp.sale.admin.config;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
import java.io.IOException;
public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor {
private final String headerName;
private final String headerValue;
public HeaderRequestInterceptor(String headerName, String headerValue) {
this.headerName = headerName;
this.headerValue = headerValue;
}
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
request.getHeaders().set(headerName, headerValue);
return execution.execute(request, body);
}
}

@ -0,0 +1,24 @@
package com.glxp.sale.admin.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.web.client.RestTemplate;
import java.util.ArrayList;
import java.util.List;
@Configuration
public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
List<ClientHttpRequestInterceptor> interceptors = new ArrayList<>();
interceptors.add(new HeaderRequestInterceptor("token", "123"));
RestTemplate restTemplate = new RestTemplate();
restTemplate.setInterceptors(interceptors);
return restTemplate;
}
}

@ -8,6 +8,7 @@ public class ConstantStatus {
public static final Integer ORDER_STATUS_CHECK = 2; //等待校验
public static final Integer ORDER_STATUS_FAIL = 3; //重码校验失败
public static final Integer ORDER_STATUS_SUCCESS = 4; //已校验
public static final Integer ORDER_STATUS_ADDITIONAL = 5; //补录单据
//ERP校验状态
public static final Integer ORDER_CHECK_SUCCESS = 2; //校验成功
@ -32,6 +33,11 @@ public class ConstantStatus {
public static String SORDER_CHECKED = "4";//已校验
public static String SORDER_DELIVER = "5";//已送货
public static final int RECEIVE_UN = 0; //未验收
public static final int RECEIVE_ED = 1; //已验收
public static final int RECEIVE_NOT = 2;//不需要验收
public static String SORDER_PRINT_UN = "101";//101未打印102已打印
public static String SORDER_PRINT_ED = "102";//
@ -42,11 +48,46 @@ public class ConstantStatus {
public static String ST_SCAN_ADD = "3"; //扫码单据转换
//业务单据详情DI绑定状态
public static int ORDER_DETAIL_DI_NONE = 2;
public static int ORDER_DETAIL_DI_MUTI = 1;
public static int ORDER_DETAIL_DI_ONE = 0;
//业务单据详情DI绑定供应商状态
public static int ORDER_DETAIL_SUP_NONE = 2;
public static int ORDER_DETAIL_SUP_MUTI = 1;
public static int ORDER_DETAIL_SUP_ONE = 0;
//UDI产品信息表字段类型
public static final Integer PRODUCT_TYPE_UDI = 0;
public static final Integer PRODUCT_TYPE_THIRD = 1;
//采购类型
public static final Integer PRUCHASE_ADVANCE = 1; //预入库
public static final Integer PRUCHASE_COMMON = 2; //普通采购
//往来单位类型
public static final int CORP_SICK = 1; //病人
public static final int CORP_SP = 2; //供应商
public static final int CORP_INTTERNAL = 3; //内部科室等
//单据来源
public static final int FROM_UDIMS = 1; //1.UDIMS平台
public static final int FROM_WEBNEW = 2; //网页新增
public static final int FROM_PDAED = 3; //pda已校验
public static final int FROM_PDAUN = 4; //pda未校验
public static final int FROM_PC = 5; //pc端扫码精灵
public static final int FROM_CHANGE = 6; //单据流转
public static final int FROM_UDISP = 7; //udi供应商平台
//DI类型
public static final int DITYPE_MAIN = 1; //主标识
public static final int DITYPE_SYDY = 2; //使用单元标识
public static final int DITYPE_OWN = 3; //本体标识
public static final int DITYPE_PACK = 4; //包装标识
}

@ -20,4 +20,9 @@ public interface ConstantType {
String TYPE_PUT = "WareHouseIn"; //出库
String TYPE_OUT = "WareHouseOut"; //入库
String TYPE_IN_CONSIGN = "ConsignWareHouseIn"; //寄售入库
String TYPE_OUT_CLINIC = "ClinicWareHouseOut"; //临床出库
String TYPE_OUT_CONSIGN = "ConsignWareHouseOut"; //寄售出库
}

@ -291,7 +291,7 @@ public class AuthAdminController {
}
// 修改角色
if (authAdminSaveRequest.getRoles() != null) {
if (authAdminSaveRequest.getRoles() != null && authAdminSaveRequest.getRoles().size() > 0) {
// 先删除之前的
authRoleAdminService.deleteByAdminId(authAdmin.getId());
authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId());

@ -165,9 +165,10 @@ public class CustomerController {
customerInfoService.deleteById(Long.parseLong(id));
customerContactService.deleteById(Long.parseLong(id));
userRegisterService.deleteByCustomerId(Long.parseLong(id));
authAdminService.deleteByCustomerId(Long.parseLong(id));
companyService.deleteCompany(Long.parseLong(id));
// systemPDFTemplateRelevanceService.deleteByCustomerId(Long.parseLong(id));
return ResultVOUtils.success("删除成功");
}

@ -84,7 +84,7 @@ public class LoginController {
Map<String, Object> claims = new HashMap<>();
claims.put("admin_id", authAdmin.getId());
String token = JwtUtils.createToken(claims, 86400L); // 一天后过期
String token = JwtUtils.createToken(claims, 86400L); // 一天后过期86400L
Map<String, Object> map = new HashMap<>();
map.put("id", authAdmin.getId());

@ -198,26 +198,26 @@ public class RegisterController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
log.info(httpSession.getId());
// JSONObject userCode = (JSONObject) httpSession.getAttribute("code");
// if (userCode == null) {
// return ResultVOUtils.error(500, "验证码已失效,请重新获取");
// }
// long lastTime = userCode.getLong("createTime");
// int checkCode = (Integer) userCode.get("code");
// String phoneNum = userCode.getString("memPhone");
// if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) {
// return ResultVOUtils.error(500, "验证码已过期,请重新获取");
// }
// if (checkCode != userRegisterEntity.getCheckCode()) {
// return ResultVOUtils.error(500, "验证码错误,请重新获取");
// }
// if (!phoneNum.equals(userRegisterEntity.getMobile())) {
// return ResultVOUtils.error(500, "手机号与获取验证码不一致");
// }
// boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile());
// if (isExitPhone) {
// return ResultVOUtils.error(500, "该手机号已被注册");
// }
JSONObject userCode = (JSONObject) httpSession.getAttribute("code");
if (userCode == null) {
return ResultVOUtils.error(500, "验证码已失效,请重新获取");
}
long lastTime = userCode.getLong("createTime");
int checkCode = (Integer) userCode.get("code");
String phoneNum = userCode.getString("memPhone");
if ((System.currentTimeMillis() - lastTime) > 1000 * 60 * 5) {
return ResultVOUtils.error(500, "验证码已过期,请重新获取");
}
if (checkCode != userRegisterEntity.getCheckCode()) {
return ResultVOUtils.error(500, "验证码错误,请重新获取");
}
if (!phoneNum.equals(userRegisterEntity.getMobile())) {
return ResultVOUtils.error(500, "手机号与获取验证码不一致");
}
boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile());
if (isExitPhone) {
return ResultVOUtils.error(500, "该手机号已被注册");
}
userRegisterEntity.setRegisterTime(DateUtil.getDateTime());
userRegisterEntity.setCheckType(0);//未审核
@ -386,11 +386,6 @@ public class RegisterController {
setupEntity.setCustomerId(userId + "");
setupService.insertSetup(setupEntity);
//生产接口调用日志
ApilogEntity apilogEntity = new ApilogEntity();
apilogEntity.setCustomerId(userId + "");
apilogEntity.setLsyd_query_getentinfo(1);
apilogService.insertApilog(apilogEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

@ -1,16 +1,16 @@
package com.glxp.sale.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.sale.admin.httpclient.ErpBasicClient;
import com.glxp.sale.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.sale.admin.req.basic.CombineSingleUnitRequest;
import com.glxp.sale.admin.req.basic.CombineUnitRequest;
import com.glxp.sale.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.sale.admin.req.basic.*;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse;
import com.glxp.sale.admin.res.basic.BasicUnitMaintainResponse;
@ -19,6 +19,7 @@ import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.BasicUnitMaintainService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrCorpService;
import com.glxp.sale.admin.thread.BasicUnitImportService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.common.enums.ResultEnum;
@ -54,6 +55,8 @@ public class BasicUnitMaintainController {
private BasicThirdSysService basicThirdSysService;
@Resource
BasicUnitImportService basicUnitImportService;
@Resource
private ThrCorpService thrCorpService;
@GetMapping("/udiwms/basic/unit/maintain/filter")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -138,6 +141,7 @@ public class BasicUnitMaintainController {
{
BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
BeanUtils.copyProperties(item, basicUnitMaintainResponse);
basicUnitMaintainResponse.setUnitId(item.getErpId());
return basicUnitMaintainResponse;
}).collect(Collectors.toList());
PageInfo<BasicUnitMaintainResponse> pageInfo;
@ -184,6 +188,7 @@ public class BasicUnitMaintainController {
basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
basicUnitMaintainEntity.setUpdateTime(new Date());
basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity);
}
@ -239,7 +244,7 @@ public class BasicUnitMaintainController {
basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
}
}
basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
// basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
// basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
// basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
// basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
@ -249,8 +254,30 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("关联成功");
}
//解除绑定
@GetMapping("/udiwms/unit/thirdSys/removeRl")
public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
BasicUnitMaintainEntity udiRelevanceEntity = basicUnitMaintainService.selectById(removeRelRequest.getRelId());
if (removeRelRequest.getThirdSys().equals("thirdId")) {
udiRelevanceEntity.setThirdId("");
udiRelevanceEntity.setThirdName("");
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
udiRelevanceEntity.setThirdId1("");
udiRelevanceEntity.setThirdName1("");
} else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
udiRelevanceEntity.setThirdId2("");
udiRelevanceEntity.setThirdName2("");
} else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
udiRelevanceEntity.setThirdId3("");
udiRelevanceEntity.setThirdName3("");
} else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
udiRelevanceEntity.setThirdId4("");
udiRelevanceEntity.setThirdName4("");
}
basicUnitMaintainService.updateById(udiRelevanceEntity);
return ResultVOUtils.success("解除绑定成功!");
}
@PostMapping("/udiwms/basic/unit/maintain/delete")
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -264,7 +291,69 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("删除成功");
}
//查询ERP往来单位
@GetMapping("/udiwms/unitMaintain/filterErp")
public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpUnitsResponse.getId(), unitMaintainFilterRequest.getThirdSys());
if (basicUnitMaintainEntity != null) {
erpUnitsResponse.setChecked(true);
} else {
erpUnitsResponse.setChecked(false);
}
}
return udiDlDeviceResponse;
} else {
return udiDlDeviceResponse;
}
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
List<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
{
ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity);
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(item.getUnitId(), unitMaintainFilterRequest.getThirdSys());
if (basicUnitMaintainEntity != null) {
thrCorpEntity.setChecked(true);
} else {
thrCorpEntity.setChecked(false);
}
thrCorpEntity.setId(item.getUnitId());
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用");
}
}
//获取产品信息详情(多平台)
@GetMapping("/udiwms/unitMaintain/thirdSys/detail")

@ -0,0 +1,126 @@
package com.glxp.sale.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.ConstantType;
import com.glxp.sale.admin.dao.basic.BussinessChangeTypeDao;
import com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.basic.BussinessChangeTypeService;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
public class BussinessChangeTypeController {
@Resource
private BussinessChangeTypeService bussinessChangeTypeService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@GetMapping("/spms/bussinessChangeType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessChangeTypeEntity> bussinessTypeEntities;
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction());
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
if (bussinessTypeEntities == null || bussinessTypeEntities.size() == 0) {
//创建对应流转单据
if (bussinessTypeFilterRequest.getType() != null
&& "changeEnable".equals(bussinessTypeFilterRequest.getType())
) {
if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\"");
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
} else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"采购入库单\"");
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
} else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) {
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\"");
bussinessChangeTypeEntity1.setIndex(1);
bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
}
}
}
return ResultVOUtils.success(bussinessTypeEntities);
}
@PostMapping("/spms/bussinessChangeType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
bussinessChangeTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}
@PostMapping("/spms/bussinessChangeType/update")
public BaseResponse updateBussinessType(@RequestBody BussinessChangeTypeEntity bussinessTypeEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
bussinessChangeTypeService.updateBusChangeType(bussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");
}
return ResultVOUtils.success("更新成功");
}
@PostMapping("/spms/bussinessChangeType/insert")
public BaseResponse insertBussinessType(@RequestBody BussinessChangeTypeEntity
bussinessTypeEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
bussinessChangeTypeService.insertBusChangeTypee(bussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");
}
return ResultVOUtils.success("添加成功");
}
}

@ -1,11 +1,18 @@
package com.glxp.sale.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
@ -14,8 +21,11 @@ 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.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@RestController
@ -23,8 +33,11 @@ public class BussinessLocalTypeController {
@Resource
private BussinessLocalTypeService bussinessTypeService;
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private BussinessTypeService bussinessTypeService;
@GetMapping("/udiwms/localBusType/filterJoin")
public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -34,7 +47,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BussinessLocalTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterJoin(
bussinessTypeEntities = bussinessLocalTypeService.filterJoin(
bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
@ -44,6 +57,19 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/localBusType/filterByBus")
public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
return ResultVOUtils.success(bussinessTypeEntity.getLocalAction());
}
@GetMapping("/udiwms/localBusType/filter")
public BaseResponse filterBussinessType(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -52,8 +78,14 @@ public class BussinessLocalTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String customerId = getCustomerId();
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true);
}
List<BussinessLocalTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
PageInfo<BussinessLocalTypeEntity> pageInfo;
pageInfo = new PageInfo<>(bussinessTypeEntities);
PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
@ -70,7 +102,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
bussinessTypeService.deleteById(id);
bussinessLocalTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}
@ -82,7 +114,7 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
bussinessTypeService.updateBusLocalType(bussinessTypeEntity);
bussinessLocalTypeService.updateBusLocalType(bussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");
}
@ -98,11 +130,12 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessTypeService.findBTByAction(bussinessTypeEntity.getAction());
bussinessTypeEntity.setAction("ST" + CustomUtil.getId());
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getAction());
if (bussinessLocalTypeEntity != null) {
ResultVOUtils.error(999, "业务类型已存在!");
} else {
bussinessTypeService.insertBussinessType(bussinessTypeEntity);
bussinessLocalTypeService.insertBussinessType(bussinessTypeEntity);
}
} else {
@ -111,5 +144,15 @@ public class BussinessLocalTypeController {
return ResultVOUtils.success("更新成功");
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
}

@ -1,24 +1,32 @@
package com.glxp.sale.admin.controller.basic;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BussinessTypResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.util.FileUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;
/**
@ -31,7 +39,8 @@ public class BussinessTypeController {
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private AuthAdminService authAdminService;
@GetMapping("/udiwms/bussinessType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -40,6 +49,10 @@ public class BussinessTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String customerId = getCustomerId();
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true);
}
List<BussinessTypeEntity> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
PageInfo<BussinessTypeEntity> pageInfo;
@ -57,6 +70,10 @@ public class BussinessTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String customerId = getCustomerId();
if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
bussinessTypeFilterRequest.setSpUse(true);
}
List<BussinessTypResponse> bussinessTypeEntities;
bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
PageInfo<BussinessTypResponse> pageInfo;
@ -68,7 +85,6 @@ public class BussinessTypeController {
}
@PostMapping("/udiwms/bussinessType/delete")
public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -110,4 +126,49 @@ public class BussinessTypeController {
return ResultVOUtils.success("添加成功");
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
//往来单位信息文件导入
@PostMapping("/udiwms/busstiness/file/upload")
public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files) {
for (int i = 0; i < files.size(); i++) {
MultipartFile file = files.get(i);
if (file.isEmpty()) {
return ResultVOUtils.error(500, "上传第" + (i++) + "个文件失败");
}
try {
InputStream inputStream = file.getInputStream();
String json = FileUtils.readStream(inputStream);
String[] list = json.split("\r\n");
if (list != null && list.length > 0) {
for (String item : list) {
item.replace(" ", "");
String[] data = item.split(",");
BussinessTypeEntity bussinessTypeEntity = new BussinessTypeEntity();
bussinessTypeEntity.setIndex(Integer.parseInt(data[0]));
bussinessTypeEntity.setMainAction(data[1]);
bussinessTypeEntity.setAction(data[2]);
bussinessTypeEntity.setName(data[3]);
bussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity);
}
}
System.out.println(json.toUpperCase(Locale.ROOT));
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "文件格式错误!");
}
}
return ResultVOUtils.success("导入成功!");
}
}

@ -54,7 +54,7 @@ public class UdiInfoController {
//获取同步库UDI信息
@GetMapping("udiwms/udiinfo/filterUdi")
public BaseResponse filterUdi(FilterUdiInfoRequest productInfoFilterRequest) {
Map<String, Object> paramMap = new HashMap<>(16);
String nameCode = null;
if (productInfoFilterRequest.getUdiCode() != null && !productInfoFilterRequest.getUdiCode().equals("")) {
@ -63,12 +63,11 @@ public class UdiInfoController {
nameCode = udiEntity.getUdi();
} else {
return ResultVOUtils.error(500, "无效UDI码");
// nameCode = productInfoFilterRequest.getNameCode();
}
// paramMap.put("udiCode", productInfoFilterRequest.getUdiCode());
} else
nameCode = productInfoFilterRequest.getNameCode();
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("page", productInfoFilterRequest.getPage());
paramMap.put("limit", productInfoFilterRequest.getLimit());
paramMap.put("ylqxzcrbarmc", productInfoFilterRequest.getYlqxzcrbarmc());
@ -155,20 +154,39 @@ public class UdiInfoController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterErpGoodsRequest.getThirdSys());
// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
// return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
if (basicThirdSysEntity.getEnabled()) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterErpGoodsRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 || (filterErpGoodsRequest.getIsDownThrSys() != null && filterErpGoodsRequest.getIsDownThrSys())) {
ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> invmandocResponses = udiDlDeviceResponse.getData().getList();
if (invmandocResponses != null) {
for (ErpProductsResponse invmandocResponse : invmandocResponses) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode(), filterErpGoodsRequest.getThirdSys());
invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys());
if (udiRelevanceEntity != null) {
invmandocResponse.setChecked(true);
} else {
invmandocResponse.setChecked(false);
}
}
}
}
return udiDlDeviceResponse;
} else {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys());
// filterThrProductsRequest.setCode(null);
List<ThrProductsEntity> thrCorpEntities
= thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
for (ThrProductsEntity thrProductsEntity : thrCorpEntities) {
@ -179,14 +197,13 @@ public class UdiInfoController {
thrProductsEntity.setChecked(false);
}
}
PageInfo<ThrProductsEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方产品信息服务未启用");
}

@ -155,7 +155,7 @@ public class UdiInfoImportLogController {
// 滤过第一行标题
row = sheet.getRow(0);
if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) ||
|| row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null || row.getCell(6) == null) ||
(!"udiCode".equals(row.getCell(0).getStringCellValue())
|| !"医保编码".equals(row.getCell(1).getStringCellValue())
|| !"商品条码".equals(row.getCell(2).getStringCellValue())
@ -165,7 +165,7 @@ public class UdiInfoImportLogController {
|| !"thirdId3".equals(row.getCell(6).getStringCellValue()))) {
return ResultVOUtils.error(500, "文件格式错误!");
}
for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) {
for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) {
row = sheet.getRow(k);
if (row == null || row.getRowNum() <= 0) {
continue;
@ -220,6 +220,13 @@ public class UdiInfoImportLogController {
cell8.setCellType(CellType.STRING);
udiInfoImportEntity.setThirdId4(cell8.getStringCellValue());
}
Cell cell9 = row.getCell(8);
if (cell9 != null) {
cell9.setCellType(CellType.STRING);
udiInfoImportEntity.setIsUseDy(cell9.getStringCellValue());
}
udiInfoImportEntity.setGenKeyFk(genKey);
udiInfoImportEntity.setStatus(0);
udiInfoImportEntity.setUpdateTime(new Date(System.currentTimeMillis()));
@ -252,22 +259,22 @@ public class UdiInfoImportLogController {
}
UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey);
List<UdiInfoImportDetailEntity> udiInfoImportEntities = postUdiInfoRequest.getDatas();
if(udiInfoImportEntities!=null){
for(UdiInfoImportDetailEntity udiInfoImportEntity:udiInfoImportEntities){
if (udiInfoImportEntities != null) {
for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) {
udiInfoImportEntity.setGenKeyFk(genKey);
udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS);
udiInfoImportEntity.setUpdateTime(new java.util.Date());
udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity);
}
}
if(udiInfoImportLogEntity==null){
if (udiInfoImportLogEntity == null) {
udiInfoImportLogEntity = new UdiInfoImportLogEntity();
udiInfoImportLogEntity.setGenKey(genKey);
udiInfoImportLogEntity.setFromType("接口上传");
udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity);
}else {
} else {
udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
}
@ -289,22 +296,22 @@ public class UdiInfoImportLogController {
}
UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey);
List<UdiInfoImportDetailEntity> udiInfoImportEntities = postUdiInfoRequest.getDatas();
if(udiInfoImportEntities!=null){
for(UdiInfoImportDetailEntity udiInfoImportEntity:udiInfoImportEntities){
if (udiInfoImportEntities != null) {
for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) {
udiInfoImportEntity.setGenKeyFk(genKey);
udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS);
udiInfoImportEntity.setUpdateTime(new java.util.Date());
udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity);
}
}
if(udiInfoImportLogEntity==null){
if (udiInfoImportLogEntity == null) {
udiInfoImportLogEntity = new UdiInfoImportLogEntity();
udiInfoImportLogEntity.setGenKey(genKey);
udiInfoImportLogEntity.setFromType("扫码精灵上传");
udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity);
}else {
} else {
udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS);
udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity);
}
@ -331,6 +338,7 @@ public class UdiInfoImportLogController {
return ResultVOUtils.success("后台已开始下载并更新,请稍后刷新查看!");
}
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.config.WebSocketServer;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
@ -52,6 +53,8 @@ public class UdiRelevanceController {
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
UdiDlHttpClient udiDlHttpClient;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
@ -103,11 +106,20 @@ public class UdiRelevanceController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<UdiRelevanceResponse> udiRelevanceResponses = null;
filterUdiInfoRequest.setDiType(1);
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
}
filterUdiInfoRequest.setDiType(1);
udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(udiRelevanceResponses);
@ -196,6 +208,10 @@ public class UdiRelevanceController {
if (udiRelevanceEntities == null || udiRelevanceEntities.isEmpty()) {
udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
}
//todo
companyProductRelevanceService.deleteByRlId(ids);//删除供应商关联表产品信息
return ResultVOUtils.success("删除成功");
}
@ -222,7 +238,7 @@ public class UdiRelevanceController {
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
if (udiInfoEntities == null || udiInfoEntities.isEmpty()) {
udiInfoEntities = new UdiDlHttpClient(udiUrl).getUdiByUuid(key);
udiInfoEntities = udiDlHttpClient.getUdiByUuid(key);
if (udiInfoEntities != null) {
udiInfoService.insertUdiInfos(udiInfoEntities);
} else {
@ -594,9 +610,9 @@ public class UdiRelevanceController {
return ResultVOUtils.success(pageSimpleResponse);
}
//解除绑定
//解除绑定产品信息ID
@GetMapping("/udiwms/udirl/thirdSys/remove")
public BaseResponse uploadThirdServcie(RemoveRelRequest removeRelRequest) {
public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid());
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
@ -635,6 +651,31 @@ public class UdiRelevanceController {
return ResultVOUtils.success("解除绑定成功!");
}
//解除绑定DI器械信息
@GetMapping("/udiwms/udirl/di/remove")
public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(CustomUtil.getUUId());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity);
udiRelevanceEntity.setUuid(udiInfoEntity.getUuid());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
return ResultVOUtils.success("解除绑定成功!");
}
//获取是否启用供应商维护产品信息
@GetMapping("/udiwms/udiinfo/spcombie")
public BaseResponse getSBCombie() {
@ -653,7 +694,7 @@ public class UdiRelevanceController {
}
return ResultVOUtils.success("更新成功!");
} else {
return ResultVOUtils.error(500,"参数错误!!");
return ResultVOUtils.error(500, "参数错误!!");
}
}

@ -16,6 +16,7 @@ import com.glxp.sale.admin.service.info.CompanyCertService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -37,6 +38,9 @@ public class CompanyCertController {
@Resource
private CompanyCertService companyCertService;
@Value("${file_path}")
private String filePath;
@GetMapping("/sale/info/company/cert/filter")
public BaseResponse filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest,
BindingResult bindingResult) {
@ -91,9 +95,9 @@ public class CompanyCertController {
@PostMapping("/sale/info/deleteCompanyCert")
public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
boolean b = companyCertService.deleteById(deleteCompanyFileRequest.getId());
String URL="d:/1s/udiwms/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image2/" + deleteCompanyFileRequest.getFilePath();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
return ResultVOUtils.success("成功");

@ -17,6 +17,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -32,6 +33,10 @@ import java.util.List;
@RestController
public class CompanyController {
@Value("${file_path}")
private String filePath;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -82,7 +87,7 @@ public class CompanyController {
// }
if (StringUtils.isNotBlank(companyEntity.getNewFilePath())) {
if (StringUtils.isNotBlank(companyEntity.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath();
String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
@ -92,7 +97,7 @@ public class CompanyController {
}
if (StringUtils.isNotBlank(companyEntity.getNewFilePath2())) {
if (StringUtils.isNotBlank(companyEntity.getFilePath2())) {
String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath2();
String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath2();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
@ -102,7 +107,7 @@ public class CompanyController {
}
if (StringUtils.isNotBlank(companyEntity.getNewFilePath3())) {
if (StringUtils.isNotBlank(companyEntity.getFilePath3())) {
String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath3();
String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath3();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
@ -112,7 +117,7 @@ public class CompanyController {
}
if (StringUtils.isNotBlank(companyEntity.getNewFilePath4())) {
if (StringUtils.isNotBlank(companyEntity.getFilePath4())) {
String URL="d:/1s/udiwms/register/file/image1/" + companyEntity.getFilePath4();
String URL=filePath+"/register/file/image1/" + companyEntity.getFilePath4();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();

@ -41,15 +41,15 @@ public class CompanyProductRelevanceController {
@GetMapping("/sale/info/company/product/relevance/filter")
public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceResponse,
public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
companyProductRelevanceResponse.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceResponse);
companyProductRelevanceRequest.setDiType(1);
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) {
// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) {
// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) {

@ -14,6 +14,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -34,7 +35,8 @@ public class CompanySalesmanController {
private AuthAdminService authAdminService;
@Resource
private CompanySalesmanService companySalesmanService;
@Value("${file_path}")
private String filePath;
@GetMapping("/sale/info/company/salesman/filter")
public BaseResponse filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest,
BindingResult bindingResult) {
@ -85,7 +87,7 @@ public class CompanySalesmanController {
companySalesmanEntity.setUpdate_time(new Date());
if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath())) {
if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image5/" + companySalesmanEntity.getFilePath();
String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
@ -95,7 +97,7 @@ public class CompanySalesmanController {
}
if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath2())) {
if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath2())) {
String URL="d:/1s/udiwms/register/file/image5/" + companySalesmanEntity.getFilePath2();
String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath2();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
@ -112,14 +114,14 @@ public class CompanySalesmanController {
public BaseResponse deleteCompanySalesman(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
boolean b = companySalesmanService.deleteById(deleteCompanyFileRequest.getId());
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image5/" + deleteCompanyFileRequest.getFilePath();
String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
}
}
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) {
String URL="d:/1s/udiwms/register/file/image5/" + deleteCompanyFileRequest.getFilePath2();
String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath2();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();

@ -16,6 +16,7 @@ import com.glxp.sale.admin.service.info.SuppliersEnterpriseBasicCertService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -32,6 +33,10 @@ import java.util.List;
@RestController
public class SuppliersEnterpriseBasicCertController {
@Value("${file_path}")
private String filePath;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -92,7 +97,7 @@ public class SuppliersEnterpriseBasicCertController {
@PostMapping("/udiwms/info/suppliers/enterprise/basic/cert/deleteCompanyCert")
public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
boolean b = suppliersEnterpriseBasicCertService.deleteById(deleteCompanyFileRequest.getId());
String URL="d:/1s/udiwms/register/file/image3/" + deleteCompanyFileRequest.getFilePath();
String URL=filePath+"/register/file/image3/" + deleteCompanyFileRequest.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();

@ -24,6 +24,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -39,6 +40,11 @@ import java.util.List;
@RestController
public class SuppliersEnterpriseBasicController {
@Value("${file_path}")
private String filePath;
@Resource
private AuthAdminService authAdminService;
@Resource
@ -100,9 +106,9 @@ public class SuppliersEnterpriseBasicController {
suppliersEnterpriseBasicCertService.getCompanyCert(filterSuppliersEnterpriseBasicCertRequest);
for (SupplierEnterpriseBasicCertEntity supplierEnterpriseBasicCertEntity : supplierEnterpriseBasicCertEntityList) {
if (StringUtils.isNotBlank(supplierEnterpriseBasicCertEntity.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image3/" + supplierEnterpriseBasicCertEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath + "/register/file/image3/" + supplierEnterpriseBasicCertEntity.getFilePath();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}
@ -114,16 +120,16 @@ public class SuppliersEnterpriseBasicController {
suppliersRegistrationBasicService.getRegistration(suppliersRegistrationBasicRequest);
for (SuppliersRegistrationBasicEntity suppliersRegistrationBasicEntity : suppliersRegistrationBasicEntityList) {
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getInstructions())) {
String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}

@ -14,6 +14,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -33,6 +34,8 @@ public class SuppliersRegistrationBasicController {
private AuthAdminService authAdminService;
@Resource
private SuppliersRegistrationBasicService suppliersRegistrationBasicService;
@Value("${file_path}")
private String filePath;
@GetMapping("/udiwms/info/suppliers/registration/basic/getRegistrationInfo")
public BaseResponse getRegistrationInfo(SuppliersRegistrationBasicRequest suppliersRegistrationBasicRequest) {
@ -71,9 +74,9 @@ public class SuppliersRegistrationBasicController {
suppliersRegistrationBasicEntity.setUpdate_date(new Date());
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getNewFilePath())) {
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + suppliersRegistrationBasicEntity.getFilePath();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}
@ -81,9 +84,9 @@ public class SuppliersRegistrationBasicController {
}
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getNewInstructions())) {
if (StringUtils.isNotBlank(suppliersRegistrationBasicEntity.getInstructions())) {
String URL="d:/1s/udiwms/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + suppliersRegistrationBasicEntity.getInstructions();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}
@ -100,16 +103,16 @@ public class SuppliersRegistrationBasicController {
@GetMapping("/udiwms/info/suppliers/registration/basic/delete")
public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) {
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) {
String URL="d:/1s/udiwms/register/file/image4/" + deleteCompanyFileRequest.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + deleteCompanyFileRequest.getFilePath();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) {
String URL="d:/1s/udiwms/register/file/image4/" + deleteCompanyFileRequest.getFilePath2();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
String URL = filePath+"/register/file/image4/" + deleteCompanyFileRequest.getFilePath2();
File file = new File(URL);
if (file.exists() && file.isFile()) {
file.delete();
}
}

@ -1,5 +1,7 @@
package com.glxp.sale.admin.controller.inout;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
@ -17,13 +19,12 @@ import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.inout.*;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.thread.InvProductsTrService;
import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.FileUtils;
import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -34,7 +35,10 @@ import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -48,23 +52,20 @@ public class OrderController {
@Resource
private CodesService codesService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private UdiInfoService udiInfoService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private SystemParamConfigService systemParamConfigService;
private CodesTempService codesTempService;
@Resource
private BussinessTypeService bussinessTypeService;
@Value("${UCLOD_SERVER_URL}")
private String ucloudUrl;
private OrderDetailService orderDetailService;
@Resource
IoTransInoutService ioTransInoutService;
@Resource
StockOrderService stockOrderService;
@Resource
InvProductsTrService invProductsTrService;
@Resource
BussinessTypeService bussinessTypeService;
@Value("${file_path}")
private String filePath;
@GetMapping("udiwms/inout/order/getUdi")
public BaseResponse getUdi(@RequestParam("code") String code) {
@ -84,7 +85,6 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("udiwms/inout/order/error")
public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
// orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL);
@ -152,14 +152,14 @@ public class OrderController {
BindingResult bindingResult) {
if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success();
if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) orderFilterRequest.setCustomerId(null);
if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID))
orderFilterRequest.setCustomerId(null);
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
orderFilterRequest.setStatusOrOne(3);
}
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
List<WarehouseEntity> warehouseEntityList = codesService.findByCode(orderFilterRequest.getCode());
@ -184,11 +184,22 @@ public class OrderController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId());
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
return ResultVOUtils.error(500, "单据未找到!");
} else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) {
return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据!");
} else
orderFilterRequest.setId(stockOrderEntity.getOrderIdFk());
if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) {
orderFilterRequest.setId(null);
}
List<OrderEntity> orderEntityList;
if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) {
orderFilterRequest.setStatus(4);
orderFilterRequest.setContrastStatus(2);
orderFilterRequest.setReceiveStatus(0);
// orderFilterRequest.setReceiveStatus(0);
// orderFilterRequest.setStatusOrOne(3);
}
if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
@ -227,7 +238,6 @@ public class OrderController {
}
}
invProductsTrService.genInvProducts(orderEntity.getId());
return ResultVOUtils.success("更新成功");
@ -251,6 +261,7 @@ public class OrderController {
return ResultVOUtils.success(pageSimpleResponse);
}
//更新订单
@PostMapping("/udiwms/inout/order/updateExportStatus")
public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,
BindingResult bindingResult) {
@ -265,6 +276,43 @@ public class OrderController {
return ResultVOUtils.success("更新成功");
}
//导出订单json)
@PostMapping("warehouse/inout/order/exportXml")
public void exportXml(@RequestBody DeleteRequest deleteRequest, HttpServletResponse res) {
List<String> orderIds = deleteRequest.getIds();
List<PostOrderRequest.PostOrder> postOrders = new ArrayList<>();
PostOrderRequest postOrderRequest = new PostOrderRequest();
for (String orderId : orderIds) {
OrderEntity orderEntity = orderService.findById(orderId);
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderId);
PostOrderRequest.PostOrder postOrder = new PostOrderRequest.PostOrder();
postOrder.setCodes(warehouseEntityList);
postOrder.setBillType(orderEntity.getAction());
String json = JSONObject.toJSON(postOrder).toString();
String fileName = filePath + "/订单导出/" + orderId + ".json";
// new FileUtils().writeFile(fileName, json);
orderEntity.setExportStatus(ConstantStatus.ORDER_EXPORT_ED);
orderEntity.setExportFilePath(fileName);
orderService.updateOrder(orderEntity);
postOrders.add(postOrder);
}
postOrderRequest.setPostOrders(postOrders);
String json = JSONObject.toJSON(postOrderRequest).toString();
String fileName = "已完成单据导出_" + CustomUtil.getId() + ".json";
res.setHeader("Content-disposition", "attachment;fileName=" + fileName);
res.setContentType("text/plain;charset=UTF-8");
try {
res.getOutputStream().write(json.getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
e.printStackTrace();
}
// return ResultVOUtils.success("文件生成成功!!");
}
@PostMapping("/warehouse/inout/order/mergeOrder")//TODO 合并订单
public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
@ -274,29 +322,31 @@ public class OrderController {
List<String> orderList = orderMergeRequest.getOrderList();
SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest();
systemParamConfigRequest.setParamKey("forbidSameErp");
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(systemParamConfigRequest);
if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) {
List<ErpOrderEntity> mergeList = new ArrayList<>();
if (orderList != null && orderList.size() > 1) {
for (String orderId : orderList) {
OrderEntity orderEntity = orderService.findById(orderId);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS) {
return ResultVOUtils.error(500, "已完成的订单不能合并!");
}
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
mergeList.addAll(erpOrderEntities);
}
orderDetailService.deleteByOrderId(orderId);
}
for (String orderId : orderList) {
orderDetailService.deleteByOrderId(orderId);
}
String mainOrder = orderList.get(0);
for (int i = 1; i < orderList.size(); i++) {
codesService.updateOrderId(orderList.get(i), mainOrder);
orderService.deleteByOrderId(orderList.get(i));
orderService.deleteById(orderList.get(i));
codesTempService.updateOrderId(orderList.get(i), mainOrder);
}
OrderEntity mainOrderEntity = orderService.findById(mainOrder);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(mainOrderEntity.getAction());
List<String> docids = getDocids(mergeList);
String docidStr = "";
if (docids != null && docids.size() > 0) {
@ -307,52 +357,34 @@ public class OrderController {
}
mainOrderEntity.setErpFk(docidStr);
orderService.updateOrder(mainOrderEntity);
List<ErpOrderEntity> erpOrderEntities = new ErpOrderClient(ucloudUrl).getErpOrder(docids, mainOrderEntity.getAction());
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder);
orderDetailService.insertErpOrders(returnOrders);
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(mainOrder);
new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList,
systemParamConfigService, bussinessTypeEntity);
} else {
orderService.updateContrastStatus(mainOrder, "error");
orderService.updateRemark(mainOrder, "U8Cloud获取ERP单失败");
return ResultVOUtils.error(500, "U8Cloud获取ERP单失败");
}
ioTransInoutService.transStatus(mainOrderEntity.getId());
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
} else {
if (orderList != null && orderList.size() > 1) {
for (String orderId : orderList) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> erpOrderEntities = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
if (erpOrderEntity.getErpOrderId() != null) {
return ResultVOUtils.error(500, "已校验过订单不能合并!");
}
}
}
orderDetailService.deleteByOrderId(orderId);
}
String mainOrder = orderList.get(0);
for (int i = 1; i < orderList.size(); i++) {
codesService.updateOrderId(orderList.get(i), mainOrder);
orderService.deleteByOrderId(orderList.get(i));
}
new Thread(() -> {
List<WarehouseEntity> datas = codesService.findByReceiptId(mainOrder);
new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, orderDetailService, datas);
ioTransInoutService.printOrder(mainOrder);
}).start();
}
return ResultVOUtils.success("合并成功,后台正在数据转换,请稍后刷新重试!");
}
return ResultVOUtils.success("合并成功,后台正在数据转换,请稍后刷新重试!");
//异常单据撤回
@GetMapping("/spms/inout/order/revoke")
public BaseResponse revokeOrder(OrderFilterRequest orderFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
OrderEntity orderEntity = orderService.findById(orderFilterRequest.getId());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
codesTempService.insertCodesTemp(warehouseEntityList);
codesService.deleteByOrderId(orderEntity.getId());
orderService.updateOrder(orderEntity);
return ResultVOUtils.success("单据撤回成功!");
}
public List<String> getDocids(List<ErpOrderEntity> mergeList) {
List<String> docids = new ArrayList<>();

@ -1,12 +1,14 @@
package com.glxp.sale.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.DataTransUtil;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
@ -31,7 +33,9 @@ import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.sale.admin.service.thrsys.ThrOrderService;
import com.glxp.sale.admin.thread.InvDlErpStockService;
import com.glxp.sale.admin.thread.InvProductsTrService;
import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -72,7 +76,6 @@ public class OrderDetailController {
@Resource
private CheckOrderUtils checkOrderUtils;
@Resource
private IoTransInoutService transInoutService;
@Autowired
@ -94,16 +97,18 @@ public class OrderDetailController {
private BussinessTypeService bussinessTypeService;
@Resource
ThrDataService thrDataService;
@Resource
InvProductsTrService invProductsTrService;
@Resource
IoTransInoutService ioTransInoutService;
@GetMapping("/udiwms/erpOrder/filter")
public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest,
@GetMapping("/spms/erpOrder/filter")
public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
@ -113,7 +118,7 @@ public class OrderDetailController {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterErpOrderRequest.getCustomerId()));
filterThrOrderRequest.setUnitIdFk(companyEntity.getUnitIdFk());
}
// filterErpOrderRequest.setBillAction(filterErpOrderRequest.getOriginType());
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
@ -130,8 +135,8 @@ public class OrderDetailController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount()+"");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount()+"");
subErpOrder.setCount(thrOrderDetailEntity.getCount() + "");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount() + "");
subErpOrders.add(subErpOrder);
}
}
@ -148,6 +153,57 @@ public class OrderDetailController {
// }
}
//手持终端下载业务单据
@GetMapping("/udiwms/erpOrder/filter")
public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction());
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillNo(filterErpOrderRequest.getBillNo());
stockOrderFilterRequest.setStartTime(filterErpOrderRequest.getStartDate());
stockOrderFilterRequest.setEndTime(filterErpOrderRequest.getEndDate());
stockOrderFilterRequest.setBillType(bussinessTypeEntity.getLocalAction());
stockOrderFilterRequest.setPage(filterErpOrderRequest.getPage());
stockOrderFilterRequest.setStatus(ConstantStatus.SORDER_CHECK);
stockOrderFilterRequest.setLimit(filterErpOrderRequest.getLimit());
List<StockOrderEntity> data = stockOrderService.findAllOrders(stockOrderFilterRequest);
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
if (data != null && data.size() > 0) {
for (StockOrderEntity stockOrderEntity : data) {
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId() + "");
List<StockOrderDetailEntity> thrOrderDetailEntities =
stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
BeanUtils.copyProperties(stockOrderEntity, erpOrderResponse);
List<ErpOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (StockOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrder.setCount(thrOrderDetailEntity.getCount() + "");
subErpOrder.setReCount(thrOrderDetailEntity.getReCount() + "");
subErpOrders.add(subErpOrder);
}
}
erpOrderResponse.setSubErpOrders(subErpOrders);
erpOrderResponses.add(erpOrderResponse);
}
}
PageInfo<StockOrderEntity> pageInfo;
pageInfo = new PageInfo<>(data);
PageSimpleResponse<ErpOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
// }
}
@GetMapping("/udiwms/erpOrder/addStockOrder")
public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
@ -162,22 +218,25 @@ public class OrderDetailController {
}
StockOrderEntity temp = stockOrderService.findByBillNo(thrOrderEntity.getBillNo() + "");
if(temp!=null){
return ResultVOUtils.error(500,"单据已被选入,请勿重复选入!");
if (temp != null) {
return ResultVOUtils.error(500, "单据已被选入,请勿重复选入!");
}
StockOrderEntity stockOrderEntity = new StockOrderEntity();
BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
String billNo = CustomUtil.getId();
stockOrderEntity.setBillNo(billNo);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType());
stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction());
stockOrderEntity.setId(null);
stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
stockOrderEntity.setThirdOrderFk(thrOrderEntity.getBillNo());
stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
stockOrderEntity = stockOrderService.findByBillNo(billNo);
if (b) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
@ -187,7 +246,9 @@ public class OrderDetailController {
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount() + "");
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
@ -208,7 +269,28 @@ public class OrderDetailController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
erpOrderEntity.setGoodsid(erpOrderEntity.getBindRlFk());
boolean b = orderDetailService.updateErpOrder(erpOrderEntity);
erpOrderEntity = orderDetailService.findById(erpOrderEntity.getId() + "");
codesService.updateRelId(erpOrderEntity.getBindRlFk(), erpOrderEntity.getNameCode(), erpOrderEntity.getOrderIdFk());
if (b) {
return ResultVOUtils.success("绑定成功");
} else {
return ResultVOUtils.error(500, "绑定失败");
}
}
@PostMapping("/udiwms/erpOrder/updateBindSup")
public BaseResponse updateBindSup(@RequestBody ErpOrderEntity erpOrderEntity, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
erpOrderEntity.setBindSupStatus(ConstantStatus.ORDER_DETAIL_SUP_ONE);
boolean b = orderDetailService.updateErpOrder(erpOrderEntity);
erpOrderEntity = orderDetailService.findById(erpOrderEntity.getId() + "");
codesService.updateSupId(erpOrderEntity.getSupId(), erpOrderEntity.getNameCode(), erpOrderEntity.getOrderIdFk());
if (b) {
return ResultVOUtils.success("绑定成功");
} else {
@ -398,18 +480,18 @@ public class OrderDetailController {
}
@PostMapping("/warehouse/repeatCheck")//TODO 重新校验
public BaseResponse repeatCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
transInoutService.repeatCheck(orderEntity.getId());
return ResultVOUtils.success("后台已开始校验,请稍后刷新重试!");
}
// @PostMapping("/warehouse/repeatCheck")//TODO 重新校验
// public BaseResponse repeatCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
// orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
// OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
// transInoutService.repeatCheck(orderEntity.getId());
// return ResultVOUtils.success("后台已开始校验,请稍后刷新重试!");
// }
@PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验
public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {
@ -420,17 +502,49 @@ public class OrderDetailController {
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
ioTransInoutService.transStatus(orderEntity.getId());
orderEntity = orderService.findById(orderEntity.getId());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) {
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
if (erpIds != null && erpIds.size() > 0) {
if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID则自动校验
List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);
orderDetailService.deleteByOrderId(orderEntity.getId());
List<WarehouseEntity> warehouseEntityList = codesService.findByReceiptId(orderEntity.getId());
transInoutService.genOrderDetail(warehouseEntityList);
checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
} else {
//未绑定Id,则更改状态,等待校验
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
orderService.updateOrder(orderEntity);
}
}
// transInoutService.repeatPrint(orderEntity);
// if (!bussinessTypeEntity.getCheckEnable()
// || (orderEntity.getFromType().intValue() == ConstantStatus.FROM_CHANGE && !bussinessTypeEntity.isCheckChange())) { //不需要校验,则直接生成库存
// orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
// orderService.updateOrder(orderEntity);
// transInoutService.checkMutiDi(orderEntity.getId());
// if (orderEntity.getContrastStatus() != ConstantStatus.ORDER_CHECK_FAIL) {
// orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS);
// if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
// invProductsTrService.genInvProducts(orderEntity.getId());
// }
// transInoutService.printOrder(orderEntity.getId());
// }
// } else {
//
// List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
// if (erpIds != null && erpIds.size() > 0) { //已经绑定ERPID则自动校验
// List<ErpOrderEntity> erpOrderEntities = thrDataService.getStockOrders(erpIds);
// checkOrderUtils.check(orderEntity.getId(), erpOrderEntities);
// } else {
// //未绑定Id,则更改状态,等待校验
// orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
// orderService.updateOrder(orderEntity);
// }
//
// }
return ResultVOUtils.success("后台已开始校验,请稍后刷新重试!");
}
}

@ -3,14 +3,17 @@ package com.glxp.sale.admin.controller.inout;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.constant.IncodeStatus;
import com.glxp.sale.admin.controller.inout.inventory.InvPrintController;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.StockPrinttREntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.StockPrintEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.inventory.InCodeLogEntity;
@ -18,6 +21,7 @@ import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.sale.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.httpclient.ErpOrderClient;
import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.req.inventory.PostStockPrintRequest;
@ -27,6 +31,7 @@ import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
@ -48,8 +53,11 @@ import org.springframework.util.MultiValueMap;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@ -78,7 +86,8 @@ public class StockOrderController {
@Value("${STOCK_PRINT_POST}")
private String stpUrl;
@Resource
private AuthAdminService authAdminService;
@Resource
private InvPrintController invPrintController;
@Resource
@ -173,11 +182,13 @@ public class StockOrderController {
}
}
if (StringUtils.isBlank(stockOrderEntity.getId())) {
if (!getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderPostRequest.getCustomerId()));
stockOrderEntity.setCorpId(companyEntity.getUnitIdFk());
stockOrderEntity.setCorpName(companyEntity.getCompanyName());
stockOrderEntity.setUnitIdFk(companyEntity.getUnitIdFk());
}
stockOrderEntity.setCustomerId(stockOrderPostRequest.getCustomerId());
stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
b = stockOrderService.insertStockOrder(stockOrderEntity);
@ -251,6 +262,9 @@ public class StockOrderController {
if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
if (companyEntity.getUnitIdFk().equals("110")) {
stockOrderFilterRequest.setUnitIdFk(null);
} else
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
stockOrderFilterRequest.setCorpId(null);
}
@ -276,8 +290,9 @@ public class StockOrderController {
stockOrderFilterRequest.setBillType(stockOrderFilterRequest.getBillAction());
}
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
if (stockOrderFilterRequest.getCustomerId() != null) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCustomerId()));
String customerId = getCustomerId();
if (customerId != null) {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId));
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
}
@ -325,6 +340,14 @@ public class StockOrderController {
return ResultVOUtils.success();
}
@PostMapping("/udiwms/stock/order/update")
public BaseResponse submitStockOrder(@RequestBody StockOrderEntity stockOrderEntity) {
stockOrderService.updateById(stockOrderEntity);
return ResultVOUtils.success();
}
@GetMapping("/udiwms/stock/order/new/submit")
public BaseResponse submitNewStockOrder(@RequestParam("id") String id) {
StockOrderEntity stockOrderEntity = new StockOrderEntity();
@ -346,7 +369,6 @@ public class StockOrderController {
@GetMapping("/udiwms/stock/order/error/submit")
public BaseResponse submitStockOrderError(@RequestParam("id") String id) {
StockOrderEntity stockOrderEntity = new StockOrderEntity();
stockOrderEntity.setId(id);
stockOrderEntity.setStatus(101 + "");//重新提交为未处理
stockOrderService.updateById(stockOrderEntity);
return ResultVOUtils.success();
@ -355,7 +377,15 @@ public class StockOrderController {
@PostMapping("/udiwms/stock/order/qrcode/generate/text")
public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
if (stockOrderIdsRequest.getIds().size() < 1) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
if (stockOrderIdsRequest.getIds() == null || stockOrderIdsRequest.getIds().size() < 1) {
if (stockOrderIdsRequest.getId() != null) {
List<String> ids = new ArrayList<>();
ids.add(stockOrderIdsRequest.getId());
stockOrderIdsRequest.setIds(ids);
} else
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
for (String id : stockOrderIdsRequest.getIds()) {
stockOrderFilterRequest.setId(id);
@ -379,22 +409,27 @@ public class StockOrderController {
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode() + "");
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntities.add(stockPrintEntity);
}
} else {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId());
stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode());
stockPrintEntity.setSOrderId(stockOrderEntity.getId());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setCount(Integer.parseInt(stockOrderDetailEntity.getReCount()));
stockPrintEntities.add(stockPrintEntity);
}
}
@ -464,4 +499,16 @@ public class StockOrderController {
return ResultVOUtils.success(billNo);
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
}

@ -3,8 +3,10 @@ package com.glxp.sale.admin.controller.inout;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
import com.glxp.sale.admin.entity.inout.OrderEntity;
@ -12,6 +14,7 @@ import com.glxp.sale.admin.entity.inout.StockQRCodeTextEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.httpclient.ErpOrderClient;
import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
@ -23,6 +26,7 @@ import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inout.PurchaseinResponse;
import com.glxp.sale.admin.res.inout.StockOrderDetailQueryProductResponse;
import com.glxp.sale.admin.res.inout.StockOrderDetailResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
@ -38,10 +42,14 @@ import com.glxp.sale.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@ -65,6 +73,8 @@ public class StockOrderDetailController {
private IoTransInoutService transInoutService;
@Autowired
private SystemParamConfigService systemParamConfigService;
@Resource
AuthAdminService authAdminService;
@GetMapping("/udiwms/stock/order/detail/filter")
public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest,
@ -233,12 +243,25 @@ public class StockOrderDetailController {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setId(id);
companyProductRelevanceRequest.setDiType(1);
List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
companyProductRelevanceRequest.setCustomerId(getCustomerId());
List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setId(id);
filterUdiInfoRequest.setDiType(1);
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (udiRelevanceResponses.size() > 0) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId());
companyProductRelevanceResponses.add(companyProductRelevanceResponse);
}
} else
companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId()+"");
stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId() + "");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
if (stockOrderIdsRequest.getUdiEntity() != null) {
@ -302,34 +325,6 @@ public class StockOrderDetailController {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@GetMapping("/udiwms/stock/order/detail/addFromCodeById")
public BaseResponse addStockOrderDetailFromCodeById(@RequestParam("orderId") String orderId,
@RequestParam("id") String id) {
UdiInfoEntity udiInfoEntity =
udiInfoService.findById(id);
if (udiInfoEntity != null) {
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
stockOrderDetailEntity.setOrderIdFk(orderId);
stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode());
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setBatchNo(udiInfoEntity.getBatchNo());
stockOrderDetailEntity.setProductDate(udiInfoEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiInfoEntity.getExpireDate());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setSweepCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity);
return ResultVOUtils.success();
}
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品");
}
@GetMapping("/udiwms/stock/order/detail/queryProduct")
public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) {
@ -360,7 +355,7 @@ public class StockOrderDetailController {
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (basicInstrumentMaintainRelevanceResponses.size() == 1) {
stockOrderDetailQueryProductResponse.setGetType("1");
stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getId() + "");
stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getRlId() + "");
} else if (basicInstrumentMaintainRelevanceResponses.size() > 1) {
stockOrderDetailQueryProductResponse.setGetType("2");
} else {
@ -382,19 +377,33 @@ public class StockOrderDetailController {
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
}
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
} else {
nameCode = filterUdiInfoRequest.getNameCode();
}
filterUdiInfoRequest.setNameCode(nameCode);
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
}
filterUdiInfoRequest.setDiType(1);
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest);
companyProductRelevanceRequest.setDiType(1);
List<CompanyProductRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
basicInstrumentMaintainRelevanceResponses = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
BeanUtils.copyProperties(udiRelevanceResponse, companyProductRelevanceResponse);
companyProductRelevanceResponse.setRlId(udiRelevanceResponse.getId());
basicInstrumentMaintainRelevanceResponses.add(companyProductRelevanceResponse);
}
} else
basicInstrumentMaintainRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
//todo 为什么要把去掉使用单元
@ -490,4 +499,15 @@ public class StockOrderDetailController {
return ResultVOUtils.error(500, "删除失败");
}
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
}

@ -1,5 +1,7 @@
package com.glxp.sale.admin.controller.inout;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -8,11 +10,26 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.entity.basic.StockPrintEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.inventory.StockPrintTempEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.FilterStockprintRequest;
import com.glxp.sale.admin.req.inventory.DeleteStPrintTempRequest;
import com.glxp.sale.admin.req.inventory.FilterStPrintTempRequest;
import com.glxp.sale.admin.req.itextpdf.PdfPrintCountEntity;
import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.inventory.InvStockPrintService;
import com.glxp.sale.admin.service.inventory.StockPrintTempService;
import com.glxp.sale.admin.thread.JaspaperService;
import com.glxp.sale.admin.util.CustomUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -20,10 +37,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity;
import com.glxp.sale.admin.entity.inout.StockQRCodeTextEntity;
import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.sale.admin.req.inout.DeleteRequest;
@ -42,7 +55,6 @@ import com.glxp.sale.admin.service.param.SystemPDFModuleService;
import com.glxp.sale.admin.service.param.SystemPDFTemplateService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.thread.IoTransInoutService;
import com.glxp.sale.admin.util.ITextPDFUtils;
import com.glxp.sale.admin.util.JasperUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -56,26 +68,22 @@ public class StockQRCodeTextController {
@Resource
StockOrderDetailService stockOrderDetailService;
@Resource
StockOrderDetailTempService stockOrderDetailTempService;
@Resource
StockQRCodeTextService stockQRCodeTextService;
@Resource
UdiInfoService udiInfoService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
InvStockPrintService stockPrintService;
@Resource
CompanyService companyService;
@Value("${file_path}")
private String dirPath;
@Resource
private IoTransInoutService transInoutService;
@Autowired
private SystemParamConfigService systemParamConfigService;
private StockPrintTempService stockPrintTempService;
@Resource
private JaspaperService jaspaperService;
@GetMapping("/udiwms/stock/qrcode/text/filter")
public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest,
@ -124,24 +132,197 @@ public class StockQRCodeTextController {
}
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/file")
public void stockQRCodeTextPDFFromTemplateFile(
public BaseResponse stockQRCodeTextPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID));
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
if (systemPDFModuleEntity == null) return;
if (systemPDFModuleEntity == null) return null;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return;
if (systemPDFTemplateEntity == null) return null;
List<StockPrintEntity> printEntities = new ArrayList<>();
List<StockPrintEntity> mStockPrintEntities = new ArrayList<>();
FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterStockprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
List<StockPrintEntity> stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
stockPrintEntity.setCorpName(companyEntity.getCompanyName());
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
StockPrintEntity clone = new StockPrintEntity();
BeanUtils.copyProperties(stockPrintEntity, clone);
printEntities.add(clone);
}
} else {
printEntities.add(stockPrintEntity);
}
}
if (printEntities.size() > 1000) { //如果标签打印数据大于1000则切割生成多个文件
List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();
for (int i = 0; i < splits.size(); i++) {
index++;
StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
String fileName = stockQRCodeTextPDFTemplateRequest.getQueryId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempEntity.setStatus(0);
stockPrintTempEntity.setGenKey(CustomUtil.getId());
stockPrintTempService.insertStockPrintTempEntity(stockPrintTempEntity);
stockPrintTempEntities.add(stockPrintTempEntity);
}
jaspaperService.printPdfLocal(splits, stockPrintTempEntities, systemPDFTemplateEntity.getPath());
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockPrintTempEntities);
return ResultVOUtils.success(pageSimpleResponse);
StockPrintEntity stockPrintEntity = stockPrintService.selectById(stockQRCodeTextPDFTemplateRequest.getId());
} else {
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", stockPrintEntity);
data.put("data", printEntities);
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity);
}
return null;
}
@PostMapping("/udiwms/pdf/template/stock/qrcode/text/maxfile")
public BaseResponse stockQRCodeMaxTextPDFFromTemplateFile(
@RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest
) throws Exception {
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + "");
if (systemPDFModuleEntity == null) return null;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return null;
List<StockPrintEntity> printEntities = new ArrayList<>();
List<StockPrintEntity> mStockPrintEntities = new ArrayList<>();
FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest();
DeleteStPrintTempRequest deleteStPrintTempRequest = new DeleteStPrintTempRequest();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
filterStockprintRequest.setSOrderId(stockQRCodeTextPDFTemplateRequest.getOrderId());
deleteStPrintTempRequest.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId() + "");
} else {
deleteStPrintTempRequest.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempService.deleteById(deleteStPrintTempRequest);
List<StockPrintEntity> stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest);
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
StockPrintEntity clone = new StockPrintEntity();
BeanUtils.copyProperties(stockPrintEntity, clone);
printEntities.add(clone);
}
} else {
printEntities.add(stockPrintEntity);
}
}
List<List<StockPrintEntity>> splits = CustomUtil.splitList(printEntities, 100);
int index = 0;
List<StockPrintTempEntity> stockPrintTempEntities = new ArrayList<>();
for (int i = 0; i < splits.size(); i++) {
index++;
StockPrintTempEntity stockPrintTempEntity = new StockPrintTempEntity();
if (stockQRCodeTextPDFTemplateRequest.getOrderId() != null) {
String fileName = stockQRCodeTextPDFTemplateRequest.getOrderId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setStockOrderFk(stockQRCodeTextPDFTemplateRequest.getOrderId());
} else {
String fileName = stockQRCodeTextPDFTemplateRequest.getQueryId() + "__" + index + "__标签打印" + ".pdf";
String filePath = dirPath + "\\pdfprint\\" + fileName;
stockPrintTempEntity.setFileName(fileName);
stockPrintTempEntity.setFilePath(filePath);
stockPrintTempEntity.setPrintCodeIdFk(stockQRCodeTextPDFTemplateRequest.getQueryId());
}
stockPrintTempEntity.setStatus(0);
stockPrintTempEntity.setGenKey(CustomUtil.getId());
stockPrintTempService.insertStockPrintTempEntity(stockPrintTempEntity);
stockPrintTempEntities.add(stockPrintTempEntity);
}
jaspaperService.printPdfLocal(splits, stockPrintTempEntities, systemPDFTemplateEntity.getPath());
for (StockPrintEntity stockPrintEntity : mStockPrintEntities) {
stockPrintEntity.setPrintStatus("102");
stockPrintService.updateStockPrint(stockPrintEntity);
}
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockPrintTempEntities);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockPrintTempEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/spms/stock/qrcode/filterTemp")
public BaseResponse filterTemp(FilterStPrintTempRequest filterStPrintTempRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<StockPrintTempEntity> stockQRCodeTextEntityList
= stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest);
PageInfo<StockPrintTempEntity> pageInfo;
pageInfo = new PageInfo<>(stockQRCodeTextEntityList);
PageSimpleResponse<StockPrintTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(stockQRCodeTextEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, StockPrintEntity stockPrintEntity) {
for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(stockPrintEntity.getId() + "")) {
return pdfPrintCount;
}
}
return null;
}
//-----------打印订单
@PostMapping("/udiwms/pdf/template/inspection/stock/order/file")
@ -202,7 +383,23 @@ public class StockQRCodeTextController {
/*打印订单*/
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
if (list != null && list.size() > 0) {
int index = 1;
// List<StockOrderPrintResponse> stockOrderPrintResponses = new ArrayList<>();
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(list.get(0).getCustomerId()));
for (StockOrderPrintEntity stockOrderPrintEntity : list) {
stockOrderPrintEntity.setIndex(index + "");
stockOrderPrintEntity.setTitle(stockOrderPrintEntity.getCorpName());
// StockOrderPrintResponse stockOrderPrintResponse = new StockOrderPrintResponse();
// BeanUtils.copyProperties(stockOrderPrintEntity, stockOrderPrintResponse);
// stockOrderPrintResponse.setPrice(stockOrderPrintEntity.getPrice());
// stockOrderPrintResponse.setTotalPrice(stockOrderPrintEntity.getTotalPrice());
stockOrderPrintEntity.setAmount(BigDecimal.valueOf(85.36));
stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88));
stockOrderPrintEntity.setTotalPriceWord("18888");
stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName());
index++;
// stockOrderPrintResponses.add(stockOrderPrintResponse);
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =

@ -1,9 +1,11 @@
package com.glxp.sale.admin.controller.inout;
import cn.hutool.db.sql.Order;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil;
import com.glxp.sale.admin.controller.inout.utils.InoutUtils;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
@ -13,9 +15,11 @@ import com.glxp.sale.admin.entity.inout.Warehousetemp;
import com.glxp.sale.admin.entity.receipt.MipsBarcodeEntity;
import com.glxp.sale.admin.entity.receipt.ProductOrderDetailEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
import com.glxp.sale.admin.req.inout.*;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inout.WarehouseResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@ -39,8 +43,11 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
@ -65,6 +72,8 @@ public class WareHouseController {
CompanyService companyService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
AuthAdminService authAdminService;
@GetMapping("admin/warehouse/inout/list")
public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@ -187,12 +196,40 @@ public class WareHouseController {
}
@PostMapping("/warehouse/inout/addCommit")//补录提交
public BaseResponse addCommitOrder(@RequestBody CommitRequest commitRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
OrderEntity orderEntity = orderService.findById(commitRequest.getOrderId());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderService.updateOrder(orderEntity);
return ResultVOUtils.success("提交成功");
}
@GetMapping("warehouse/inout/submitOrderWeb")
public BaseResponse submitOrderWeb(@RequestParam("orderId") String orderId) {
orderService.updateOrderStatus(orderId, ConstantStatus.ORDER_STATUS_PROCESS);
public BaseResponse submitOrderWeb(AddOrderRequest orderEntity) {
orderService.updateOrderStatus(orderEntity.getOrderId(), ConstantStatus.ORDER_STATUS_PROCESS);
saveOrderWeb(orderEntity);
return ResultVOUtils.success();
}
@PostMapping("warehouse/inout/saveOrderWeb")
public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
OrderEntity orderEntity1 = new OrderEntity();
orderEntity1.setId(addOrderRequest.getOrderId());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
orderEntity1.setAction(addOrderRequest.getAction());
orderEntity1.setMainAction(bussinessTypeEntity.getMainAction());
orderService.updateOrder(orderEntity1);
return ResultVOUtils.success();
}
@GetMapping("warehouse/inout/deleteCodesTempById")
public BaseResponse deleteCodesTempById(@RequestParam("id") Long id) {
WarehouseEntity warehouseEntity = new WarehouseEntity();
@ -215,7 +252,9 @@ public class WareHouseController {
if (udiEntity == null)
return ResultVOUtils.error(500, "UDI码格式错误");
String orderId = addOrderRequest.getOrderId();
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
addOrderRequest.setFromCorp(companyEntity.getCompanyName());
addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk()));
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType());
if (StringUtils.isBlank(orderId)) {
orderId = System.currentTimeMillis() + new Random().nextInt(10) + "";
@ -225,21 +264,22 @@ public class WareHouseController {
orderSaveRequest.setActDate(addOrderRequest.getActDate());
}
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
orderSaveRequest.setFromCorpId(companyEntity.getUnitIdFk());
orderSaveRequest.setFromCorp(companyEntity.getCompanyName());
orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction());
orderSaveRequest.setAction(bussinessTypeEntity.getAction());
orderSaveRequest.setActor(addOrderRequest.getActor());
orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId());
// orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId());
// orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp());
orderSaveRequest.setFromType(addOrderRequest.getFromType());
orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW);
orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);
orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN);
orderSaveRequest.setCustomerId(addOrderRequest.getCustomerId());
orderService.insertOrder(orderSaveRequest);
}
@ -292,6 +332,8 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
try {
String customerId = getCustomerId();
postOrderRequest.setCustomerId(customerId);
ioTransInoutService.creatOrderWeb(postOrderRequest);
} catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@ -308,6 +350,8 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
try {
String customerId = getCustomerId();
postOrderRequest.setCustomerId(customerId);
ioTransInoutService.creatOrder(postOrderRequest);
} catch (Exception e) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
@ -350,4 +394,14 @@ public class WareHouseController {
return ResultVOUtils.success("添加成功");
}
public String getCustomerId() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
return authAdmin.getCustomerId() + "";
}
}

@ -99,6 +99,9 @@ public class InvPrintController {
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
stockPrintEntity.setGenKeyFk(genKey);
//#DI#生产日期#失效日期#批次号#序列号#仓位号#货位号#
String udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() +
"#" + stockPrintEntity.getBatchNo() + "#" + stockPrintEntity.getSerialNo() + "#" + stockPrintEntity.getWarehouseCode() + "#" + stockPrintEntity.getSpaceCode();
stockPrintEntity.setUdiCode(udiCode);

@ -1,5 +1,6 @@
package com.glxp.sale.admin.controller.inout.utils;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
@ -11,6 +12,8 @@ import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.thread.InvProductsTrService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -19,7 +22,7 @@ import java.util.List;
@Service
public class CheckOrderUtils {
@Resource
private OrderDetailService myErpOrderService;
private OrderDetailService orderDetailService;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
@ -32,7 +35,7 @@ public class CheckOrderUtils {
public void check(String orderId, List<ErpOrderEntity> vailOrderEntities) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderId);
List<ErpOrderEntity> myErpOrders = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
List<ErpOrderEntity> myErpOrders = orderDetailService.filterAllMyErpOrder(filterErpOrderRequest);
OrderEntity orderEntity = orderService.findById(orderId);
String errMsg = null;
@ -41,6 +44,8 @@ public class CheckOrderUtils {
filterUdiInfoRequest.setNameCode(myErpOrder.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && myErpOrder.getBindRlFk() == null) {
myErpOrder.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
orderDetailService.updateErpOrder(myErpOrder);
orderEntity.setRemark("该产品DI绑定多个产品ID请在扫码单据详情绑定对应产品ID");
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
@ -66,13 +71,14 @@ public class CheckOrderUtils {
&& checkCount(vailOrderEntity, myErpOrder) == null
) {
myErpOrder.setErpOrderId(vailOrderEntity.getErpOrderId());
myErpOrder.setErpCount(vailOrderEntity.getErpCount());
myErpOrder.setReCount(vailOrderEntity.getReCount());
myErpOrder.setGoodsname(vailOrderEntity.getGoodsname());
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("success");
vailOrderEntity.setStatus("success");
myErpOrderService.updateErpOrder(myErpOrder);
orderDetailService.updateErpOrder(myErpOrder);
break;
} else {
@ -94,7 +100,7 @@ public class CheckOrderUtils {
myErpOrder.setGoodsid(vailOrderEntity.getGoodsid());
myErpOrder.setStatus("fail");
vailOrderEntity.setStatus("fail");
myErpOrderService.updateErpOrder(myErpOrder);
orderDetailService.updateErpOrder(myErpOrder);
break;
}
}
@ -125,13 +131,17 @@ public class CheckOrderUtils {
stockOrderFilterRequest.setBillNo(id);
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
stockOrderEntity.setOrderIdFk(orderId);
stockOrderService.updateById(stockOrderEntity);
}
}
//生产库存
// invProductsTrService.genInvProducts(orderEntity.getId());
//生成库存
if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
invProductsTrService.genInvProducts(orderEntity.getId());
}
} else {
for (ErpOrderEntity erpOrderEntity : vailOrderEntities) {
@ -139,7 +149,8 @@ public class CheckOrderUtils {
erpOrderEntity.setOrderIdFk(orderId);
erpOrderEntity.setCoName(erpOrderEntity.getGoodsname());
erpOrderEntity.setPackSpec(erpOrderEntity.getGoodsunit());
myErpOrderService.insertErpOrder(erpOrderEntity);
erpOrderEntity.setErpOrderId(erpOrderEntity.getErpOrderId());
orderDetailService.insertErpOrder(erpOrderEntity);
}
}
orderEntity.setRemark(errMsg);
@ -179,7 +190,10 @@ public class CheckOrderUtils {
public String checkId(ErpOrderEntity vailOrderEntity, UdiRelevanceResponse udiRelevanceResponse) {
if (vailOrderEntity.getGoodsid() != null && udiRelevanceResponse != null) {
if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getId() + ""))
if (vailOrderEntity.getBindRlFk() != null) {
if (vailOrderEntity.getBindRlFk().equals(udiRelevanceResponse.getId() + ""))
return null;
} else if (vailOrderEntity.getGoodsid().equals(udiRelevanceResponse.getId() + ""))
return null;
} else {
return "产品ID不匹配";
@ -240,11 +254,14 @@ public class CheckOrderUtils {
public String checkCount(ErpOrderEntity vailOrderEntity, ErpOrderEntity myErpOrder) {
if (vailOrderEntity.getReCount() != null && myErpOrder.getCount() != null) {
if (vailOrderEntity.getReCount() == myErpOrder.getCount())
logger.info(vailOrderEntity.getReCount() +"------------"+myErpOrder.getCount() );
if (vailOrderEntity.getReCount().intValue() == myErpOrder.getCount().intValue()) {
return null;
}
}
return myErpOrder.getCoName() + "数量不匹配!";
}
final Logger logger = LoggerFactory.getLogger(ThrDataService.class);
}

@ -1,5 +1,6 @@
package com.glxp.sale.admin.controller.inout.utils;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicInstrumentMaintainRelevanceEntity;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
@ -78,8 +79,8 @@ public class ContrastErpUtil {
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
//校验单据详情是否有包含一个di多个绑定
String erpMsg = vailMutiDi();
if (erpMsg != null) {
errMsg = vailMutiDi();
if (errMsg != null) {
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setRemark(errMsg);
orderService.updateOrder(orderEntity);
@ -123,9 +124,8 @@ public class ContrastErpUtil {
// }
//
// }
UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
UdiInfoEntity udiInfoEntity = null;
udiInfoEntity = new InoutUtils(udiUrl).getUdiInfoByRlId(udiInfoService,udiRelevanceService, warehouseEntity.getCode());
if (warehouseEntity.getCount() > 1) {
udiInfoEntity.setCount(warehouseEntity.getCount());
}
@ -169,7 +169,10 @@ public class ContrastErpUtil {
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS);
orderService.updateOrder(orderEntity);
ioTransInoutService.printOrder(orderEntity.getId());
if (orderEntity.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) {
InvProductsTrService.genInvProducts(orderEntity.getId());
}
}
if (errorData.size() > 0) {
@ -183,7 +186,7 @@ public class ContrastErpUtil {
if (mErpOrderEntities.size() > 0) {
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
errMsg = vailCode(erpOrderEntity, warehouseEntity,null);
errMsg = vailCode(erpOrderEntity, warehouseEntity, null);
if (errMsg == null) {
int erpCount = erpOrderEntity.getCount() + warehouseEntity.getCount();
if (erpOrderEntity.getErpCount() != erpCount) {

@ -70,6 +70,9 @@ public class InoutUtils {
if (warehouseData.getMainAction().equals(ConstantType.TYPE_PUT)) {
return null;
}
//如果是预入库出库
} else if (inList.size() - outList.size() == 1) {
if (warehouseData.getMainAction().equals(ConstantType.TYPE_OUT)) {
return null;
@ -163,6 +166,8 @@ public class InoutUtils {
udiRelevanceEntity.setThirdId(udiInfoEntity.getThirdId());
udiRelevanceEntity.setThirdName(udiInfoEntity.getThirdName());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid());
udiInfoEntity.setRelId(udiRelevanceEntities.get(0).getId());
} else {
udiInfoEntity = new UdiInfoEntity();
}
@ -178,11 +183,24 @@ public class InoutUtils {
String prefix;
prefix = FilterUdiUtils.getDiStr(code);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(prefix);
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(prefix);
if (udiRelevanceResponse == null) {
udiRelevanceResponse = udiRelevanceService.selectByMainId(prefix);
}
if (udiRelevanceResponse == null) {
udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, code);
} else {
BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity);
udiInfoEntity.setRelId(udiRelevanceResponse.getId() + "");
udiInfoEntity.setCode(code);
udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity);
udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode());
}
udiInfoEntity.setCode(code);
return udiInfoEntity;
}
@ -193,17 +211,12 @@ public class InoutUtils {
List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
UdiInfoEntity udiInfoEntity = null;
if (warehouseEntity.getCode().substring(0, 1).equals("#")) {
udiInfoEntity = getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
} else
udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
udiInfoEntity = new InoutUtils(udiUrl).getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
if (udiInfoEntity != null) {
// if (warehouseEntity.getCount() != null)
// udiInfoEntity.setCount(warehouseEntity.getCount());
// else {
//
// }
udiInfoEntity.setCount(getActCount(warehouseEntity, udiRelevanceService)*warehouseEntity.getCount());
udiInfoEntity.setCount(getActCount(warehouseEntity, udiRelevanceService) * warehouseEntity.getCount());
udiInfoEntity.setRelId(warehouseEntity.getRelId());
udiInfoEntity.setSupId(warehouseEntity.getSupId());
udiInfoEntity.setStatus(warehouseEntity.getStatus());
udiInfoEntities.add(udiInfoEntity);
}
}
@ -233,12 +246,14 @@ public class InoutUtils {
erpOrderEntity.setBatchNo(erpDetailCodeEntity.getBatchNo());
erpOrderEntity.setProductDate(erpDetailCodeEntity.getProduceDate());
erpOrderEntity.setExpireDate(erpDetailCodeEntity.getExpireDate());
erpOrderEntity.setGoodsid(erpDetailCodeEntity.getRelId());
erpOrderEntity.setCount(erpDetailCodeEntity.getCount());
erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId());
erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc());
erpOrderEntity.setAuthCode(erpDetailCodeEntity.getZczbhhzbapzbh());
erpOrderEntity.setPackSpec(erpDetailCodeEntity.getGgxh());
erpOrderEntity.setUuidFk(erpDetailCodeEntity.getUuid());
erpOrderEntity.setSupId(erpDetailCodeEntity.getSupId());
erpOrderEntities.add(erpOrderEntity);
}
if (!erpOrderEntities.isEmpty())

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

@ -1,20 +1,35 @@
package com.glxp.sale.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.constant.ConstantType;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.req.inout.DeleteRequest;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inout.OrderQueryRequest;
import com.glxp.sale.admin.req.inventory.FilterCodeTraceRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import com.glxp.sale.admin.res.inventory.InvProductDetailResponse;
import com.glxp.sale.admin.res.inventory.InvProductPageRespnonse;
import com.glxp.sale.admin.res.inventory.InvProductResponse;
import com.glxp.sale.admin.res.inventory.InvProductStatResponse;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.inventory.InvProductDetailService;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.util.FilterUdiUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -22,7 +37,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.glxp.sale.admin.constant.Constant.SYSTEM_CUSTOMER_ID;
@ -33,30 +51,61 @@ public class InvProductsController {
InvProductService invProductService;
@Resource
InvProductDetailService invProductDetailService;
@Resource
OrderService orderService;
@Resource
private UdiRelevanceService udiRelevanceService;
@Resource
private UdiInfoService udiInfoService;
@GetMapping("spms/inv/products/filter")
public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false;
if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
filterInvProductRequest.setCustomerId(null);
showSup = true;
}
List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
PageInfo<InvProductResponse> pageInfo;
pageInfo = new PageInfo<>(invProductResponses);
PageSimpleResponse<InvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
InvProductPageRespnonse<InvProductResponse> pageSimpleResponse = new InvProductPageRespnonse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invProductResponses);
pageSimpleResponse.setShowSup(showSup);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("spms/inv/products/filterDetail")
public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) {
if (SYSTEM_CUSTOMER_ID.equals(filterInvProductRequest.getCustomerId())) {
filterInvProductRequest.setCustomerId(null);
}
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductRequest);
PageInfo<InvProductDetailEntity> pageInfo;
pageInfo = new PageInfo<>(invProductDetailEntities);
PageSimpleResponse<InvProductDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
List<InvProductDetailResponse> invProductDetailResponses = new ArrayList<>();
if (invProductDetailEntities.size() > 0) {
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
InvProductDetailResponse invProductDetailResponse = new InvProductDetailResponse();
BeanUtils.copyProperties(invProductDetailEntity, invProductDetailResponse);
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
invProductDetailResponse.setMainActionStr("出库");
invProductDetailResponse.setOutCount(invProductDetailEntity.getCount());
} else {
invProductDetailResponse.setMainActionStr("入库");
invProductDetailResponse.setInCount(invProductDetailEntity.getCount());
}
invProductDetailResponses.add(invProductDetailResponse);
}
}
PageSimpleResponse<InvProductDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invProductDetailEntities);
pageSimpleResponse.setList(invProductDetailResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
@ -71,12 +120,140 @@ public class InvProductsController {
InvProductEntity invProductEntity = invProductService.selectById(id);
if (invProductEntity != null) {
invProductService.deleteById(id);
invProductDetailService.deleteByProductId(invProductEntity.getId() + "");
FilterInvProductDetailRequest detailRequest = new FilterInvProductDetailRequest();
detailRequest.setSupId(invProductEntity.getSupId());
detailRequest.setBatchNo(invProductEntity.getBatchNo());
detailRequest.setProductIdFk(invProductEntity.getRelIdFk());
invProductDetailService.deleteByProductId(detailRequest);
return ResultVOUtils.success("删除成功");
} else {
return ResultVOUtils.error(500, "删除失败!");
}
}
@GetMapping("spms/inv/products/stat")
public BaseResponse statInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
if (filterInvProductDetailRequest.getCustomerId() != null && filterInvProductDetailRequest.getCustomerId().equals(SYSTEM_CUSTOMER_ID)) {
filterInvProductDetailRequest.setCustomerId(null);
}
InvProductStatResponse invProductStatResponse = new InvProductStatResponse();
//统计预入库数量
FilterInvProductDetailRequest temp1 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp1);
temp1.setPurchaseType(ConstantStatus.PRUCHASE_ADVANCE);
invProductStatResponse.setAdvanceCount(invProductDetailService.statCount(temp1));
//统计普通采购数量
FilterInvProductDetailRequest temp2 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp2);
temp2.setPurchaseType(ConstantStatus.PRUCHASE_COMMON);
invProductStatResponse.setCommonCount(invProductDetailService.statCount(temp2));
//统计入库数量
FilterInvProductDetailRequest temp3 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp3);
temp3.setMainAction(ConstantType.TYPE_PUT);
invProductStatResponse.setInCount(invProductDetailService.statCount(temp3));
//统计出库数量
FilterInvProductDetailRequest temp4 = new FilterInvProductDetailRequest();
BeanUtils.copyProperties(filterInvProductDetailRequest, temp4);
temp4.setMainAction(ConstantType.TYPE_OUT);
invProductStatResponse.setOutCount(invProductDetailService.statCount(temp4));
return ResultVOUtils.success(invProductStatResponse);
}
@GetMapping("spms/inv/products/trace")
public BaseResponse filterTrace(FilterCodeTraceRequest filterCodeTraceRequest) {
if (filterCodeTraceRequest.getCode() == null) {
return ResultVOUtils.success();
}
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setCode(filterCodeTraceRequest.getCode());
filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
if (invProductDetailEntities.size() > 0) {
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
FilterInvProductDetailRequest filterRequest = new FilterInvProductDetailRequest();
filterRequest.setBatchNo(invProductDetailEntity.getBatchNo());
filterRequest.setProductIdFk(invProductDetailEntity.getProductIdFk());
filterRequest.setSupId(filterCodeTraceRequest.getSupId());
List<InvProductDetailEntity> resultLists = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
List<InvProductDetailResponse> invProductDetailResponses = new ArrayList<>();
if (invProductDetailEntities.size() > 0) {
for (InvProductDetailEntity temp : resultLists) {
InvProductDetailResponse invProductDetailResponse = new InvProductDetailResponse();
BeanUtils.copyProperties(temp, invProductDetailResponse);
if (temp.getMainAction().equals(ConstantType.TYPE_OUT)) {
invProductDetailResponse.setMainActionStr("出库");
invProductDetailResponse.setOutCount(temp.getCount());
} else {
invProductDetailResponse.setMainActionStr("入库");
invProductDetailResponse.setInCount(temp.getCount());
}
invProductDetailResponses.add(invProductDetailResponse);
}
}
PageInfo<InvProductDetailResponse> pageInfo;
pageInfo = new PageInfo<>(invProductDetailResponses);
InvProductPageRespnonse<InvProductDetailResponse> pageSimpleResponse = new InvProductPageRespnonse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(invProductDetailResponses);
return ResultVOUtils.success(pageSimpleResponse);
} else {
return ResultVOUtils.error(500, "未查询到数据!");
}
}
@GetMapping("spms/inv/products/order/trace")
public BaseResponse filterOrderTrace(FilterCodeTraceRequest filterCodeTraceRequest) {
if (filterCodeTraceRequest.getCode() == null) {
return ResultVOUtils.success();
}
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterCodeTraceRequest.getCode());
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoBean.getUuid());
String code = null;
if (udiInfoEntities != null && udiInfoEntities.size() > 1) {
code = FilterUdiUtils.transGlxpNoSerStr(udiEntity);
} else {
code = filterCodeTraceRequest.getCode();
}
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setCode(code);
filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.filterInvProduct(filterInvProductDetailRequest);
if (invProductDetailEntities.size() > 0) {
Map<String, String> filterMap = new HashMap<>();
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
filterMap.put(invProductDetailEntity.getOrderIdFk(), invProductDetailEntity.getOrderIdFk());
}
List<String> orderIds = new ArrayList<>();
for (String key : filterMap.keySet()) {
orderIds.add(key);
}
List<OrderEntity> orderEntities = orderService.filterListByOrder(orderIds);
PageInfo<OrderEntity> pageInfo;
pageInfo = new PageInfo<>(orderEntities);
InvProductPageRespnonse<OrderEntity> pageSimpleResponse = new InvProductPageRespnonse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderEntities);
return ResultVOUtils.success(pageSimpleResponse);
} else {
return ResultVOUtils.error(500, "未查询到数据!");
}
}
}

@ -89,7 +89,7 @@ public class PDFDawnloadController {
}
inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType()+"");
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
@ -130,7 +130,7 @@ public class PDFDawnloadController {
inoutOrderDetailPDFCodeRequest.setSettingData(settingData);
//-----------------------------------------------
inoutOrderDetailPDFCodeRequest.setFromCorp(orderEntity.getFromCorp());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType());
inoutOrderDetailPDFCodeRequest.setFromType(orderEntity.getFromType()+"");
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
inoutOrderDetailPDFCodeRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());

@ -0,0 +1,13 @@
package com.glxp.sale.admin.controller.test;
import lombok.Data;
@Data
public class HeadRequest {
private String appId;
private String userName;
private String time;
private String secretKey;
private String sign;
}

@ -0,0 +1,85 @@
package com.glxp.sale.admin.controller.test;
import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.sale.admin.req.param.SystemPDFModuleRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.param.SystemPDFModuleResponse;
import com.glxp.sale.admin.util.Md5Utils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class TestController {
final Logger logger = LoggerFactory.getLogger(TestController.class);
@GetMapping("/udplat/test")
public BaseResponse list() {
try {
HeadRequest headRequest = new HeadRequest();
headRequest.setAppId("20004072");
headRequest.setUserName(URLEncoder.encode("福建片仔癀诊断技术有限公司", "UTF-8"));//福建片仔癀诊断技术有限公司
headRequest.setTime(System.currentTimeMillis() + "");
headRequest.setSecretKey("hoGxLSEsSyysnS9");
String url = "appId=" + headRequest.getAppId() + "&secretKey=" + headRequest.getSecretKey() + "&time=" + headRequest.getTime()
+ "&userName=" + headRequest.getUserName();
String sign = Md5Utils.md5(url);
String sign1 = Md5Utils.stringToMD5(url);
headRequest.setSign(sign);
logger.info(url + "\n" + sign1);
logger.info(JSON.toJSONString(headRequest));
return ResultVOUtils.success(headRequest);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return ResultVOUtils.success("");
}
@GetMapping("/udplat/hosp/test")
public BaseResponse hospList() {
try {
HeadRequest headRequest = new HeadRequest();
headRequest.setAppId("10000090");
headRequest.setUserName(URLEncoder.encode("诏安县医院", "UTF-8"));
headRequest.setTime(System.currentTimeMillis() + "");
headRequest.setSecretKey("QchvZnPYK1jyOYV");
String url = "appId=" + headRequest.getAppId() + "&secretKey="+ headRequest.getSecretKey() + "&time=" + headRequest.getTime()
+ "&userName=" + headRequest.getUserName();
// String sign = Md5Utils.stringToMD5(url);
String sign = Md5Utils.md5(url);
headRequest.setSign(sign);
logger.info(JSON.toJSONString(headRequest));
return ResultVOUtils.success(headRequest);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
return ResultVOUtils.success("");
}
public void getMd5Sign() {
}
}

@ -0,0 +1,190 @@
package com.glxp.sale.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpExportLogEntity;
import com.glxp.sale.admin.httpclient.ErpBasicClient;
import com.glxp.sale.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.sale.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.sale.admin.req.thrsys.ThrCorpExportRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpUnitsResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.sale.admin.service.thrsys.ThrCorpExportLogService;
import com.glxp.sale.admin.service.thrsys.ThrCorpService;
import com.glxp.sale.admin.thread.ThrCorpsDlService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
*
*/
@RestController
public class ThrCorpExportLogController {
@Resource
ThrCorpExportLogService thrCorpExportLogService;
@Resource
ThrCorpService thrCorpService;
@Resource
ThrCorpsDlService thrCorpsDlService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@GetMapping("/udiwms/thrCorp/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrCorpExportLogEntity> thrCorpExportLogEntities
= thrCorpExportLogService.filterThrCorpExportLog(filterUdiEpLogReques);
PageInfo<ThrCorpExportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpExportLogEntities);
PageSimpleResponse<ThrCorpExportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpExportLogEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/thrCorp/exportLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
thrCorpExportLogService.deleteById(id + "");
return ResultVOUtils.success("删除成功");
}
//往来单位excel文件下载
@GetMapping("/udiwms/thrCorp/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
List<ThrCorpExportLogEntity> thrCorpExportLogEntities = thrCorpExportLogService.filterThrCorpExportLog(filterUdiEpLogRequest);
ThrCorpExportLogEntity thrOrderExportLogEntity = thrCorpExportLogEntities.get(0);
try {
String filePath = thrOrderExportLogEntity.getFilePath();
String fileName = "temp";
if (filePath != null && filePath.length() > 0) {
String[] data = filePath.split("/");
fileName = data[data.length - 1];
}
res.setHeader("Content-disposition", "attachment;fileName=" + fileName);
res.setContentType("text/plain;charset=UTF-8");
FileInputStream input = new FileInputStream(new File(filePath));
OutputStream out = res.getOutputStream();
byte[] b = new byte[2048];
int len;
while ((len = input.read(b)) != -1) {
out.write(b, 0, len);
}
input.close();
if (thrOrderExportLogEntity.getDlCount() == 0) {
thrOrderExportLogEntity.setDlCount(1);
} else {
thrOrderExportLogEntity.setDlCount(thrOrderExportLogEntity.getDlCount() + 1);
}
thrCorpExportLogService.updateThrCorpExportLog(thrOrderExportLogEntity);
} catch (Exception ex) {
System.out.println("下载失败!");
}
}
//往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrCorp/importLog/export")
public BaseResponse excelDownload(@RequestBody ThrCorpExportRequest thrCorpExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "第三方往来单位信息导出" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
if (!file.exists()) {
try {
file.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
}
ThrCorpExportLogEntity thrCorpExportLogEntity = new ThrCorpExportLogEntity();
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId();
thrCorpExportLogEntity.setGenKey(genKey);
thrCorpExportLogEntity.setFilePath(fileName);
thrCorpExportLogEntity.setUpdateTime(new Date());
thrCorpExportLogEntity.setDlCount(0);
thrCorpExportLogEntity.setType(1);
thrCorpExportLogService.insertThrCorpExportLog(thrCorpExportLogEntity);
thrCorpsDlService.genExcel(genKey, thrCorpExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件请稍后刷新查看!");
}
//第三方往来单位接口下载(第三方使用)
@GetMapping("/udiwms/thrsys/thrCorp/download")
public BaseResponse downloadThrCorps(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
List<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
{
ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity);
thrCorpEntity.setId(item.getUnitId());
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用");
}
}
}

@ -0,0 +1,87 @@
package com.glxp.sale.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.entity.thrsys.ThrCorpImportDetailEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.thrsys.ThrCorpImportDetailService;
import com.glxp.sale.admin.service.thrsys.ThrCorpImportLogService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
*
*/
@RestController
public class ThrCorpImportLogController {
@Resource
ThrCorpImportLogService thrCorpImportLogService;
@Resource
ThrCorpImportDetailService thrCorpImportDetailService;
@GetMapping("/udiwms/thrCorp/importLog/filter")
public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrCorpImportLogEntity> thrCorpImportLogEntities
= thrCorpImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrCorpImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpImportLogEntities);
PageSimpleResponse<ThrCorpImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpImportLogEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/thrCorp/importLog/filterDetail")
public BaseResponse filterDetail(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrCorpImportDetailEntity> thrCorpImportDetailEntities
= thrCorpImportDetailService.filterCorpDetailImport(filterUdiIpLogRequest);
PageInfo<ThrCorpImportDetailEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpImportDetailEntities);
PageSimpleResponse<ThrCorpImportDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpImportDetailEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/thrCorp/importLog/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest();
filterInCodeLogRequest.setId(Integer.parseInt(id));
List<ThrCorpImportLogEntity> thrCorpImportLogEntities = thrCorpImportLogService.filterImportLog(filterInCodeLogRequest);
if (thrCorpImportLogEntities != null && thrCorpImportLogEntities.size() > 0) {
ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogEntities.get(0);
thrCorpImportLogService.deleteById(thrCorpImportLogEntity.getId() + "");
thrCorpImportDetailService.deleteByGenkey(thrCorpImportLogEntity.getGenKey());
}
return ResultVOUtils.success("删除成功");
}
}

@ -0,0 +1,164 @@
package com.glxp.sale.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.BasicProcessStatus;
import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.sale.admin.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.sale.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.sale.admin.req.thrsys.PostThrCorpRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpUnitsResponse;
import com.glxp.sale.admin.service.thrsys.ThrCorpImportLogService;
import com.glxp.sale.admin.service.thrsys.ThrCorpService;
import com.glxp.sale.admin.thread.ThrCorpsDlService;
import com.glxp.sale.admin.util.Constant;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.RedisUtil;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@RestController
public class ThrCorpsController {
@Resource
RedisUtil redisUtil;
@Resource
private ThrCorpService thrCorpService;
@Resource
private ThrCorpsDlService thrCorpsDlService;
@Resource
private ThrCorpImportLogService thrCorpImportLogService;
@GetMapping("/udiwms/thrsys/getCorps")
public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/thrsys/delCorps")
public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
thrCorpService.deleteByUnitId(id);
return ResultVOUtils.success("删除成功");
}
@RequestMapping("/udiwms/thrsys/corp/delAll")
public BaseResponse delAll() {
thrCorpService.deleteAll();
return ResultVOUtils.success("删除成功");
}
//第三方服务上传(包括文件导入后上传)
@PostMapping("/udiwms/thrsys/postCorps")
public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ErpUnitsResponse> erpUnitsResponses = postThrCorpRequest.getCorps();
if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) {
String genKey = postThrCorpRequest.getGenKey();
if (genKey == null) {
genKey = CustomUtil.getId();
}
ThrCorpImportLogEntity thrCorpImportLogEntity = thrCorpImportLogService.selectByGenKey(genKey);
if (thrCorpImportLogEntity == null) {
thrCorpImportLogEntity = new ThrCorpImportLogEntity();
thrCorpImportLogEntity.setGenKey(genKey);
if (postThrCorpRequest.getUploadType() != null) {
thrCorpImportLogEntity.setFromType(postThrCorpRequest.getUploadType());
} else
thrCorpImportLogEntity.setFromType("第三方系统上传");
thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
thrCorpImportLogEntity.setUpdateTime(new Date());
thrCorpImportLogEntity.setThirdSysFk(postThrCorpRequest.getThirdSys());
thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity);
}
thrCorpsDlService.insertData(genKey, postThrCorpRequest.getThirdSys(), erpUnitsResponses);
return ResultVOUtils.success("往来单位上传成功!后台正在处理,请稍后刷新查看!");
}
return ResultVOUtils.error(500, "上传数据为空");
}
//接口一键全部
@RequestMapping("/udiwms/thrsys/corp/downloadAll")
public BaseResponse downloadAll(FilterThrCorpRequest filterThrProductsRequest) {
String data = (String) redisUtil.get(Constant.dlThrProducts);
if (data != null && data.equals("true")) {
return ResultVOUtils.error(500, "当前任务正在下载更新产品信息,请稍后重试!");
} else {
redisUtil.set(Constant.dlThrCorps, "true", 30);
if (filterThrProductsRequest.getThirdSysFk() == null) {
return ResultVOUtils.error(500, "未选择第三方系统!");
}
ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity();
String genKey = CustomUtil.getId();
thrCorpImportLogEntity.setGenKey(genKey);
thrCorpImportLogEntity.setFromType("第三方系统获取");
thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
thrCorpImportLogEntity.setUpdateTime(new Date());
thrCorpImportLogEntity.setThirdSysFk(filterThrProductsRequest.getThirdSysFk());
thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity);
thrCorpsDlService.importCorps(genKey,null, filterThrProductsRequest.getThirdSysFk());
return ResultVOUtils.success("后台开始下载更新,请稍后刷新查看");
}
}
//选中或者下载全部
@PostMapping("/udiwms/thrsys/corp/corpsDlAll")
public BaseResponse corpsDlAll(@RequestBody BasicUnitMaintainFilterRequest filterThrCorpRequest) {
filterThrCorpRequest.setThirdSysFk(filterThrCorpRequest.getThirdSys());
String data = (String) redisUtil.get(Constant.dlThrProducts);
if (data != null && data.equals("true")) {
return ResultVOUtils.error(500, "当前任务正在下载更新产品信息,请稍后重试!");
} else {
redisUtil.set(Constant.dlThrCorps, "true", 30);
if (filterThrCorpRequest.getThirdSysFk() == null) {
return ResultVOUtils.error(500, "未选择第三方系统!");
}
ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity();
String genKey = CustomUtil.getId();
thrCorpImportLogEntity.setGenKey(genKey);
thrCorpImportLogEntity.setFromType("第三方系统获取");
thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
thrCorpImportLogEntity.setUpdateTime(new Date());
thrCorpImportLogEntity.setThirdSysFk(filterThrCorpRequest.getThirdSysFk());
thrCorpImportLogService.insertImportLog(thrCorpImportLogEntity);
if (filterThrCorpRequest.getThrCorpEntities() != null && filterThrCorpRequest.getThrCorpEntities().size() > 0) {//选中导出
thrCorpsDlService.importSelectCorps(genKey, filterThrCorpRequest.getThrCorpEntities(), filterThrCorpRequest.getThirdSysFk());
} else { //结果导出
thrCorpsDlService.importCorps(genKey,filterThrCorpRequest, filterThrCorpRequest.getThirdSysFk());
}
// thrCorpsDlService.importCorps(genKey, filterThrCorpRequest.getThirdSysFk());
return ResultVOUtils.success("后台开始下载更新,请稍后刷新查看");
}
}
}

@ -25,6 +25,7 @@ import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -53,6 +54,8 @@ public class ThrOrderExportLogController {
private ThrOrderService thrOrderService;
@Resource
private ThrOrderDetailService thrOrderDetailService;
@Value("${file_path}")
String filePath;
@GetMapping("/udiwms/thrOrder/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -123,11 +126,10 @@ public class ThrOrderExportLogController {
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity();
udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId();
String fileName = "D:\\udiwms\\exportFile\\" + "业务单据导出" + genKey + ".xls";
String fileName = filePath + "\\exportExcelFile\\" + "业务单据导出" + genKey + ".xls";
File file = new File(fileName);
if (!file.exists()) {
try {
@ -182,7 +184,7 @@ public class ThrOrderExportLogController {
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
if (basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getFromType() == 0) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
} else {
//todo 订单查询,需加日期

@ -204,10 +204,10 @@ public class ThrOrderImportLogController {
if (cell5 != null) {
cell5.setCellType(CellType.STRING);
String billType = cell5.getStringCellValue();
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType);
if (bussinessTypeEntity != null) {
corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction());
} else
// BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByName(billType);
// if (bussinessTypeEntity != null) {
// corpImportDetailEntity.setBillType(bussinessTypeEntity.getAction());
// } else
corpImportDetailEntity.setBillType(billType);
@ -270,6 +270,14 @@ public class ThrOrderImportLogController {
corpImportDetailEntity.setReCount(Integer.parseInt(count));
}
}
Cell cell15 = row.getCell(14);
if (cell15 != null) {
cell15.setCellType(CellType.STRING);
String originType = cell15.getStringCellValue();
if (originType != null && !"".equals(originType)) {
corpImportDetailEntity.setOriginType(originType);
}
}
corpImportDetailEntity.setThirdSysFk(thirdSys);
corpImportDetailEntity.setGenKeyFk(genKey);

@ -42,7 +42,6 @@ public class ThrProductsImportLogController {
@GetMapping("/udiwms/thrProducts//importLog/filter")
public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
@ -180,6 +179,11 @@ public class ThrProductsImportLogController {
cell6.setCellType(CellType.STRING);
erpProductsResponse.setManufactory(cell6.getStringCellValue());
}
Cell cell7 = row.getCell(6);
if (cell7 != null) {
cell7.setCellType(CellType.STRING);
erpProductsResponse.setSupName(cell7.getStringCellValue());
}
erpProductsResponses.add(erpProductsResponse);
}
}
@ -195,6 +199,7 @@ public class ThrProductsImportLogController {
}
return ResultVOUtils.success("上传成功");
}
public boolean filterEmpty(Row row) {
if (row.getCell(0) != null) {

@ -0,0 +1,42 @@
package com.glxp.sale.admin.controller.thrsys;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.req.thrsys.BaseParam;
import com.glxp.sale.admin.service.thrsys.UdplatGoodsService;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
/**
*
*/
@RestController
@RequestMapping("udplat/goods")
public class UdplatGoodsController {
@Autowired
private UdplatGoodsService udplatGoodsService;
// @AuthRuleAnnotation("udidl_udplatGoods_all")
@PostMapping("/list")
public BaseResponse getList(@RequestBody BaseParam param)
{
return udplatGoodsService.getList(param);
}
// @AuthRuleAnnotation("udidl_udplatGoods_all")
@PostMapping("/import")
public BaseResponse importExcel(MultipartFile file,int type){
try
{
return udplatGoodsService.importExcel(file.getInputStream(),type);
}catch (Exception e){
e.printStackTrace();
return ResultVOUtils.error(-1,e.getMessage());
}
}
}

@ -0,0 +1,61 @@
package com.glxp.sale.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.entity.thrsys.ThrImportLogEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.sale.admin.req.inout.DeleteRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.thrsys.ThrImportLogService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@RestController
@RequestMapping("udplat/goods/import")
public class UdplatGoodsImportController {
@Resource
ThrImportLogService thrImportLogService;
@GetMapping("/filter")
public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrImportLogEntity> thrProductsImportLogEntities
= thrImportLogService.filterImportLog(filterUdiIpLogRequest);
PageInfo<ThrImportLogEntity> pageInfo;
pageInfo = new PageInfo<>(thrProductsImportLogEntities);
PageSimpleResponse<ThrImportLogEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrProductsImportLogEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/deleteLog")
public BaseResponse deleteLog(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
FilterUdiIpLogRequest filterInCodeLogRequest = new FilterUdiIpLogRequest();
filterInCodeLogRequest.setId(Integer.parseInt(id));
List<ThrImportLogEntity> thrProductsImportLogEntities = thrImportLogService.filterImportLog(filterInCodeLogRequest);
if (thrProductsImportLogEntities != null && thrProductsImportLogEntities.size() > 0) {
ThrImportLogEntity thrInvProductsImportLogEntity = thrProductsImportLogEntities.get(0);
thrImportLogService.deleteById(thrInvProductsImportLogEntity.getId() + "");
}
return ResultVOUtils.success("删除成功");
}
}

@ -42,7 +42,7 @@ public interface AuthAdminDao {
*/
AuthAdmin findByUserName(String userName);
AuthAdmin findByUser(@Param("userName") String userName,@Param("CustomerId") String CustomerId);
AuthAdmin findByUser(@Param("userName") String userName, @Param("CustomerId") String CustomerId);
/**
@ -68,4 +68,6 @@ public interface AuthAdminDao {
* @return
*/
boolean deleteById(Long id);
boolean deleteByCustomerId(Long customerId);
}

@ -0,0 +1,22 @@
package com.glxp.sale.admin.dao.basic;
import com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface BussinessChangeTypeDao {
List<BussinessChangeTypeEntity> findByAction(String action);
boolean updateBusChangeType(BussinessChangeTypeEntity bussinessTypeEntity);
boolean insertBusChangeTypee(BussinessChangeTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);
}

@ -17,6 +17,8 @@ public interface BussinessTypeDao {
boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean insertIgnoreBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);

@ -22,5 +22,7 @@ public interface CompanyDao {
boolean insertCompany(CompanyEntity companyEntity);
boolean deleteCompany(Long customerId);
AliKeyEntity findKey(String customerId);
}

@ -32,4 +32,6 @@ public interface CompanyProductRelevanceDao {
boolean insertCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
}

@ -24,6 +24,9 @@ public interface CodesDao {
List<WarehouseEntity> findByReceiptId(@Param("orderId") String orderId);
boolean deleteByOrderId(@Param("orderId") String orderId);
List<WarehouseEntity> findByCode(@Param("code") String code);
List<WarehouseEntity> searchCode(@Param("code") String code);
@ -34,4 +37,11 @@ public interface CodesDao {
List<String> findCodesById(@Param("orderId") String orderId);
boolean updateCode(WarehouseEntity warehouseEntity);
boolean updateRelId(@Param("relId") String relId, @Param("nameCode") String nameCode, @Param("orderId") String orderId);
boolean updateSupId(@Param("supId") String supId, @Param("nameCode") String nameCode, @Param("orderId") String orderId);
}

@ -16,6 +16,8 @@ public interface CodesTempDao {
int updateById(WarehouseEntity warehouseEntitie);
boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId);
int deleteCodesTemp(@Param("codes") List<Long> warehouseEntities);
int deleteCodesTempById(WarehouseEntity warehouseEntitie);

@ -44,6 +44,9 @@ public interface OrderDao {
List<OrderEntity> filterListByCode(@Param("warehouseEntityList") List<WarehouseEntity> warehouseEntityList);
List<OrderEntity> filterListByOrder(@Param("orderList") List<String> orderList);
OrderEntity findOne(OrderFilterRequest orderFilterRequest);

@ -39,5 +39,8 @@ public interface OrderDetailDao {
List<String> selectAllIds(@Param("docids") List<String> docids);
ErpOrderEntity findById(@Param("id") String id);
boolean deleteByOrderId(@Param("id") String id);
}

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

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

@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.inventory;
import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest;
import com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -12,14 +13,17 @@ public interface InvProductDetailDao {
List<InvProductDetailEntity> filterInvProductDetail(FilterInvProductDetailRequest filterInvProductDetailRequest);
List<InvProductDetailJoinResponse> filterJoinInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
boolean insertInvProductDetail(InvProductDetailEntity invProductDetailEntity);
boolean insertInvProductDetails(List<InvProductDetailEntity> invProductDetailEntitys);
boolean insertInvProductDetails(@Param("invProductDetailEntitys") List<InvProductDetailEntity> invProductDetailEntitys);
boolean updateInvProductDetail(InvProductDetailEntity invProductDetailEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByProductId(@Param("productIdFk") String productIdFk);
boolean deleteByProductId(FilterInvProductDetailRequest productIdFk);
int statCount(FilterInvProductDetailRequest filterInvProductDetailRequest);
}

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

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

@ -0,0 +1,26 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.ThrCorpEntity;
import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrCorpDao {
List<ThrCorpEntity> filterThrCorps(FilterThrCorpRequest filterThrCorpRequest);
boolean insertThrCorps(ThrCorpEntity thrCorpEntity);
boolean insertThrCorpss(@Param("thrCorpEntitys") List<ThrCorpEntity> thrCorpEntitys);
boolean updateThrCorps(ThrCorpEntity thrCorpEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByUnitId(@Param("unitId") String unitId);
boolean deleteAll();
}

@ -0,0 +1,21 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.ThrCorpExportLogEntity;
import com.glxp.sale.admin.req.basic.FilterUdiEpLogRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrCorpExportLogDao {
List<ThrCorpExportLogEntity> filterThrCorpExportLog(FilterUdiEpLogRequest filterUdiEpLogRequest);
boolean insertThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity);
boolean updateThrCorpExportLog(ThrCorpExportLogEntity thrCorpExportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.ThrCorpImportDetailEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrCorpImportDetailDao {
List<ThrCorpImportDetailEntity> filterCorpDetailImport(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity);
boolean updateCorpDetailImport(ThrCorpImportDetailEntity thrCorpImportDetailEntity);
boolean insertCorpDetailImports(@Param("corps") List<ThrCorpImportDetailEntity> thrCorpImportDetailEntities);
boolean deleteById(@Param("id") String id);
boolean deleteByGenkey(@Param("genKey") String genKey);
}

@ -0,0 +1,21 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.ThrCorpImportLogEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrCorpImportLogDao {
List<ThrCorpImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity);
boolean updateImportLog(ThrCorpImportLogEntity thrCorpImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.ThrImportLogEntity;
import com.glxp.sale.admin.entity.thrsys.ThrOrderImportLogEntity;
import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrImportLogDao {
List<ThrImportLogEntity> filterImportLog(FilterUdiIpLogRequest filterInCodeLogRequest);
boolean insertImportLog(ThrImportLogEntity thrOrderImportLogEntity);
boolean updateImportLog(ThrImportLogEntity thrOrderImportLogEntity);
boolean deleteById(@Param("id") String id);
}

@ -0,0 +1,22 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.UdplatGoods;
import com.glxp.sale.admin.req.thrsys.BaseParam;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface UdplatGoodsMapper {
int deleteByPrimaryKey(Long id);
int insert(UdplatGoods record);
UdplatGoods selectByGoodId(String projectGoodsCode);
List<UdplatGoods> selectAll();
int update(UdplatGoods record);
List<UdplatGoods> list(BaseParam param);
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.dao.thrsys;
import com.glxp.sale.admin.entity.thrsys.UdplatLog;
import com.glxp.sale.admin.req.thrsys.JobLogFilterRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface UdplatLogMapper {
int deleteByPrimaryKey(Integer id);
int insert(UdplatLog record);
UdplatLog selectByPrimaryKey(Integer id);
List<UdplatLog> selectAll();
int updateByPrimaryKey(UdplatLog record);
List<UdplatLog> list(JobLogFilterRequest jobLogFilterRequest);
}

@ -11,10 +11,21 @@ public class BasicThirdSysDetailEntity {
private Boolean enabled;
private Boolean itrCache;
private String guideUrl;
private String thridUrl;
private String remark;
private String thirdSysFk;
private String name;
private Integer fromType;
private String localAction;
private String thirdAction;
public String getValue() {
if (value == null)
return null;
else if (thridUrl != null)
return thridUrl + value;
else
return value;
}
}

@ -31,5 +31,7 @@ public class BasicUnitMaintainEntity {
private String thirdName4;
private Date updateTime;
private int corpType;
}

@ -0,0 +1,24 @@
package com.glxp.sale.admin.entity.basic;
import lombok.Data;
@Data
public class BussinessChangeTypeEntity {
private Integer id;
private String intro;
private String action;
private String scAction;
private Integer index;
private Integer beforeTime;
private String remark;
private String name;
public Integer getBeforeTime() {
if (beforeTime == null)
return 0;
return beforeTime;
}
}

@ -13,6 +13,9 @@ public class BussinessLocalTypeEntity {
private String localName;
private String remark;
private Boolean enable;
private Boolean checkEnable;
private Boolean advanceType;
private Boolean changeEnable;
private Boolean spUse;
}

@ -13,5 +13,27 @@ public class BussinessTypeEntity {
private String thirdSysFk;
private String localAction;
private String localName;
private Boolean checkEnable;
private boolean advanceType;
private boolean genUnit;
private boolean innerOrder;
private boolean secCheckEnable;
private Boolean spUse;
private Integer index;
private boolean checkUdims;
private boolean checkPdaEd;
private boolean checkPdaUn;
private boolean checkPc;
private boolean checkWebNew;
private boolean checkChange;
private boolean secCheckUdims;
private boolean secCheckPdaEd;
private boolean secCheckPdaUn;
private boolean secCheckPc;
private boolean secCheckWebNew;
private boolean secCheckChange;
}

@ -2,10 +2,11 @@ package com.glxp.sale.admin.entity.basic;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class StockPrintEntity {
public class StockPrintEntity implements Serializable {
private Integer id;
private String udiRlIdFk;
private String udiCode;
@ -33,4 +34,6 @@ public class StockPrintEntity {
private String sOrderId;
private String sDetailId;
private Date updateTime;
private Integer count;
private String corpName;
}

@ -4,7 +4,7 @@ import java.util.Date;
public class StockPrinttREntity {
private int id;
private Integer id;
private String udiRlIdFk;
private String udiCode;
private String nameCode;
@ -33,11 +33,11 @@ public class StockPrinttREntity {
private Date updateTime;
public int getId() {
public Integer getId() {
return id;
}
public void setId(int id) {
public void setId(Integer id) {
this.id = id;
}

@ -1,6 +1,8 @@
package com.glxp.sale.admin.entity.basic;
import lombok.Data;
@Data
public class UdiInfoEntity {
private Integer id;
@ -46,7 +48,10 @@ public class UdiInfoEntity {
private String code;
private Integer count;
private String warehouseCode;
private String udplatCode;
private String relId;//关联ID主键
private Integer status;
private String supId;
private Boolean isCheck;

@ -17,6 +17,7 @@ public class UdiInfoImportDetailEntity {
private String thirdId4;
private String thirdId;
private Integer status;
private String isUseDy;
private Date updateTime;
private String remark;
private String genKeyFk;

@ -28,6 +28,12 @@ public class UdiRelevanceEntity {
private String mainId;
private String mainName;
private Integer lockStatus;
private String udplatCode;
private Boolean isAdavence;
public Integer getLockStatus() {
if (lockStatus == null)
return 1;
return lockStatus;
}
}

@ -39,6 +39,8 @@ public class ErpOrderEntity {
private Integer erpCount;
private Integer reCount;
private String uuidFk;
private String supId;
private Integer bindSupStatus;
private String nameCode;

@ -9,19 +9,29 @@ public class OrderEntity {
private String corpOrderId;
private String action;
private String actDate;
private String fromCorpId;
private String actor;
private String mainAction;
private String fromCorpId;
private String fromCorp;
private Integer status;
private Integer exportStatus;
private String fromType;
private Integer fromType;
private Integer contrastStatus;
private String erpFk;
private Integer signStatus;
private String stockCheckFk;
private String remark;
private int receiveStatus;
private Integer receiveStatus;
private String supId;
private String customerId;
private Integer exportStatus;
private String exportFilePath;
private Integer dlCount;
}

@ -2,6 +2,8 @@ package com.glxp.sale.admin.entity.inout;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderDetailEntity {
@ -18,5 +20,6 @@ public class StockOrderDetailEntity {
private String sweepCount;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private BigDecimal price;
}

@ -1,12 +1,16 @@
package com.glxp.sale.admin.entity.inout;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderEntity {
private String id;
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private String billdate;
private String corpId;
private String corpName;
@ -20,4 +24,7 @@ public class StockOrderEntity {
private String printStatus;
private String unitIdFk;
private String customerId;
private String thirdOrderFk;
private String orderIdFk;
private BigDecimal totalPrice;
}

@ -2,9 +2,12 @@ package com.glxp.sale.admin.entity.inout;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String id;
private String billNo;
private String billdate;
@ -20,4 +23,11 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String printStatus;
private String unitIdFk;
private String customerId;
private BigDecimal totalPrice;
private BigDecimal price;
private BigDecimal amount;
private String title;
private String zczbhhzbapzbh;
private String index;
private String totalPriceWord;
}

@ -0,0 +1,28 @@
package com.glxp.sale.admin.entity.inout;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StockOrderPrintResponse {
private String id;
private String billNo;
private String billdate;
private String corpId;
private String corpName;
private String billType;
private String billFlag;
private String thirdSysFk;
private String status;
private String statusInfo;
private String type;
private String sourceType;
private String printStatus;
private String unitIdFk;
private String customerId;
private BigDecimal totalPrice;
private BigDecimal price;
private String title;
private String zczbhhzbapzbh;
private String index;
}

@ -24,4 +24,16 @@ public class WarehouseEntity {
private String customerId;
private String nameCode;
private String supId;//供应商ID
private String relId;
private Integer status;
public String getSupId() {
if (supId == null) {
return fromCorpId;
}
return supId;
}
}

@ -15,4 +15,12 @@ public class InvProductDetailEntity {
private String action;
private Integer count;
private Date updateTime;
private Integer purchaseType;
private String batchNo;
private String productionDate;
private String expireDate;
private String unitFk;
private String stockIdFk;
private String supId;
private String originCode;
}

@ -18,6 +18,8 @@ public class InvProductEntity {
private Integer outCount;
private Integer reCount;
private String customerId;
private String supId;
private String unitFk;
public Integer getInCount() {
if (inCount == null)

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

@ -16,4 +16,5 @@ public class SystemPDFModuleEntity {
private Date create_time;
private Date update_time;
private String templateDlUrl;
private Integer templateType;
}

@ -18,4 +18,5 @@ public class SystemPDFTemplateEntity {
private String remark;
private Date create_time;
private Date update_time;
private String jrxmlPath;
}

@ -0,0 +1,54 @@
package com.glxp.sale.admin.entity.thrsys;
import com.glxp.sale.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
@Data
public class DeliveryGoods {
private String deliveryGoodId;//配送目录ID/bigint
@Excel(name = "*采购平台产品ID")
private String projectGoodsCode;//联采目录编码/varchar(50)
private String deliveryGoodsCode;//配送目录编码/varchar(50)
private long manufactureId;//平台生产企业ID/bigint(20)
private String manufactureName;//平台生产企业名称/varchar(50)
private long distributorId; //平台配送企业ID/bigint(20)
private String distributorName;//平台配送企业名称/varchar(50)
@Excel(name = "产品名称")
private String productName; //产品通用名/varchar(255)
private Integer compId; //组件id/bigint
@Excel(name = "型号")
private String model;//型号/varchar(1000)
@Excel(name = "规格")
private String spec;//规格/varchar(1000)
@Excel(name = "材质")
private String prodMaterial;//材质/varchar(255)
@Excel(name = "包材")
private String packMaterial;//包材/varchar(255)
@Excel(name = "注册证编号")
private String regNum;//注册证编号/varchar(255)
@Excel(name = "注册证名称")
private String regName;//注册证名称/varchar(255)
@Excel(name = "注册证有效期截止时间")
private String regValidTo;//注册证有效期截止时间/varchar(255)
private long unionProjectId;//联采项目ID/bigint(20)
private String unionProjectName;//采购项目名称/varchar(255)
private double salePrice;//价格/decimal(18,4)
private String priceUnitText;//价格单位/varchar(100)
private double topSalePrice;//最高销售限价,可能为空/decimal(18,4)
private double settlePayPrice;//医保支付标准,可能为空/varchar(255)
private Integer goodsSource;//数据来源/int(11)(取值1.集中采购 2.耗材联采 3.医院HIS/医疗机构新增 4.备案采购 9. 阳光采购10. 新型冠状病毒相关检测试剂省级集中采购14. 限新冠病毒核酸快速检测采购使用)
@Excel(name = "*缺货状态",convertExp="1=有货,2=缺货")
private String stockStatus;//缺货状态1有货、2缺货/int
@Excel(name = "更新内容")
private String changedContent;//更新内容
@Excel(name = "更新时间")
private String changedTime;//更新时间
private String proxyName;//申报企业名称/ varchar(50)
@Excel(name = "挂网状态")
private Integer onlineStatus;//挂网状态 1挂网2挂网状态为空 6 撤销申报
@Excel(name = "医用耗材代码")
private String medicalCode;//医保编码
}

@ -0,0 +1,55 @@
package com.glxp.sale.admin.entity.thrsys;
import com.glxp.sale.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
@Data
public class HospitalGoods {
private String deliveryGoodId;//配送目录ID/bigint
@Excel(name = "采购平台产品ID")
private String projectGoodsCode;//联采目录编码/varchar(50)
private String deliveryGoodsCode;//配送目录编码/varchar(50)
private long manufactureId;//平台生产企业ID/bigint(20)
@Excel(name = "生产企业")
private String manufactureName;//平台生产企业名称/varchar(50)
private long distributorId; //平台配送企业ID/bigint(20)
@Excel(name = "配送企业")
private String distributorName;//平台配送企业名称/varchar(50)
@Excel(name = "产品名称")
private String productName; //产品通用名/varchar(255)
private Integer compId; //组件id/bigint
@Excel(name = "型号")
private String model;//型号/varchar(1000)
@Excel(name = "规格")
private String spec;//规格/varchar(1000)
@Excel(name = "材质")
private String prodMaterial;//材质/varchar(255)
private String packMaterial;//包材/varchar(255)
@Excel(name = "注册证编号")
private String regNum;//注册证编号/varchar(255)
@Excel(name = "注册证名称")
private String regName;//注册证名称/varchar(255)
@Excel(name = "注册证有效期截止时间")
private String regValidTo;//注册证有效期截止时间/varchar(255)
private long unionProjectId;//联采项目ID/bigint(20)
private String unionProjectName;//采购项目名称/varchar(255)
@Excel(name = "企业报价(元)")
private double salePrice;//价格/decimal(18,4)
@Excel(name = "价格单位")
private String priceUnitText;//价格单位/varchar(100)
private double topSalePrice;//最高销售限价,可能为空/decimal(18,4)
private double settlePayPrice;//医保支付标准,可能为空/varchar(255)
private Integer goodsSource;//数据来源/int(11)(取值1.集中采购 2.耗材联采 3.医院HIS/医疗机构新增 4.备案采购 9. 阳光采购10. 新型冠状病毒相关检测试剂省级集中采购14. 限新冠病毒核酸快速检测采购使用)
private String stockStatus;//缺货状态1有货、2缺货/int
@Excel(name = "更新内容")
private String changedContent;//更新内容
@Excel(name = "更新时间")
private String changedTime;//更新时间
private String proxyName;//申报企业名称/ varchar(50)
private Integer onlineStatus;//挂网状态 1挂网2挂网状态为空 6 撤销申报
@Excel(name = "医用耗材代码")
private String medicalCode;//医保编码
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrCorpEntity {
private String id;
private String unitId;
private String name;
private String spell;
private String addr;
private String creditNo;
private String contact;
private String mobile;
private String thirdSysFk;
private Boolean checked;
private Date updateTime;
}

@ -0,0 +1,17 @@
package com.glxp.sale.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrCorpExportLogEntity {
private Integer id;
private String genKey;
private Integer status;
private Date updateTime;
private String remark;
private Integer dlCount;
private String filePath;
private Integer type;
}

@ -0,0 +1,22 @@
package com.glxp.sale.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrCorpImportDetailEntity {
private String id;
private String unitId;
private String name;
private String spell;
private String addr;
private String creditNo;
private String contact;
private String mobile;
private String thirdSysFk;
private Date updateTime;
private String genKeyFk;
}

@ -0,0 +1,16 @@
package com.glxp.sale.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrCorpImportLogEntity {
private Integer id;
private String genKey;
private Integer status;
private Date updateTime;
private String fromType;
private String thirdSysFk;
private String remark;
}

@ -0,0 +1,20 @@
package com.glxp.sale.admin.entity.thrsys;
import lombok.Data;
import java.util.Date;
@Data
public class ThrImportLogEntity {
private Integer id;
private String genKey;
private Integer status;
private Integer importType;
private Date updateTime;
private String fromType;
private String thirdSysFk;
private String remark;
}

@ -25,7 +25,7 @@ public class ThrProductsEntity {
private String ylqxzcrbarywmc;
private String cpms;
private Date updateTime;
private String supName;
private boolean isChecked;
}

@ -25,5 +25,6 @@ public class ThrProductsImportDetailEntity {
private String ylqxzcrbarywmc;
private String cpms;
private Date updateTime;
private String supName;
private String genKeyFk;
}

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

Loading…
Cancel
Save