代码备份

master
anthonyywj2 3 years ago
parent 8ac49ca345
commit 36f14e193a

@ -224,7 +224,7 @@ public class AuthAdminController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
AuthAdmin curUser = getCustomerId();
// 检查是否存在相同名称的管理员
AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName());
if (byUserName != null) {
@ -237,7 +237,7 @@ public class AuthAdminController {
if (authAdmin.getPassWord() != null) {
authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
}
authAdmin.setCustomerId(curUser.getCustomerId());
boolean b = authAdminService.insertAuthAdmin(authAdmin);
authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
if (!b) {

@ -6,6 +6,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.auth.CustomerContactEntity;
import com.glxp.sale.admin.entity.auth.CustomerInfoEntity;
import com.glxp.sale.admin.entity.auth.UserRegisterEntity;
import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.sale.admin.entity.info.ApilogEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.SetupEntity;
@ -198,22 +199,22 @@ 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, "手机号与获取验证码不一致");
}
// 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, "该手机号已被注册");
@ -370,6 +371,13 @@ public class RegisterController {
companyEntity.setBussinessStatus(userRegisterEntity.getBussinessStatus());
companyEntity.setCreditNum(userRegisterEntity.getCreditNum());
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(userRegisterEntity.getCompanyId());
if (basicUnitMaintainEntity != null) {
basicUnitMaintainEntity.setThirdId1(userRegisterEntity.getUdplatCompanyId());
basicUnitMaintainEntity.setThirdName1(userRegisterEntity.getUdplatCompanyName());
basicUnitMaintainService.updateById(basicUnitMaintainEntity);
}
FilterAliCertRequest filterAliCertRequest = new FilterAliCertRequest();
filterAliCertRequest.setId(registerCheckRequest.getAliCertId());

@ -5,11 +5,14 @@ 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.info.CompanyEntity;
import com.glxp.sale.admin.entity.inout.OrderEntity;
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.*;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inout.OrderFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrCorpRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BasicProductThirdSysResponse;
@ -18,6 +21,8 @@ import com.glxp.sale.admin.res.basic.ErpUnitsResponse;
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.info.CompanyService;
import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrCorpService;
import com.glxp.sale.admin.thread.BasicUnitImportService;
@ -57,6 +62,10 @@ public class BasicUnitMaintainController {
BasicUnitImportService basicUnitImportService;
@Resource
private ThrCorpService thrCorpService;
@Resource
private CompanyService companyService;
@Resource
private OrderService orderService;
@GetMapping("/udiwms/basic/unit/maintain/filter")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -278,6 +287,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success("解除绑定成功!");
}
@PostMapping("/udiwms/basic/unit/maintain/delete")
public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
@ -285,9 +295,22 @@ public class BasicUnitMaintainController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(id);
basicUnitMaintainService.deleteById(id);
//判断是否被单据绑定
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setFromCorpId(basicUnitMaintainEntity.getErpId());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
if (orderEntity != null) {
return ResultVOUtils.error(500, "已存在该供应商单据,无法删除!");
}
//判断供应商是否已存在
CompanyEntity companyEntity = companyService.findCompanyByUnitFk(basicUnitMaintainEntity.getErpId());
if (companyEntity != null) {
return ResultVOUtils.error(500, "供应商已注册,无法删除!");
}
basicUnitMaintainService.deleteById(id);
return ResultVOUtils.success("删除成功");
}

@ -43,6 +43,9 @@ public class BussinessChangeTypeController {
}
List<BussinessChangeTypeEntity> bussinessTypeEntities;
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getAction());
if (bussinessLocalTypeEntity == null) {
return ResultVOUtils.error(500, "该业务类型未绑定扫码单据类型!");
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(bussinessLocalTypeEntity.getAction());
bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());

@ -3,15 +3,20 @@ 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.BussinessChangeTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
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.req.inout.StockOrderFilterRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService;
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.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -35,9 +40,13 @@ public class BussinessLocalTypeController {
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private BussinessChangeTypeService bussinessChangeTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private StockOrderService stockOrderService;
@GetMapping("/udiwms/localBusType/filterJoin")
public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
@ -102,6 +111,19 @@ public class BussinessLocalTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id);
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
if (stockOrderEntity != null) {
return ResultVOUtils.error(500, "已存在该类型码业务单据,无法删除!");
}
BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction());
if (bussinessChangeTypeEntity != null && bussinessChangeTypeEntity.getScAction() != null) {
return ResultVOUtils.error(500, "该业务单据类型已绑定流转单据类型,无法删除!");
}
bussinessLocalTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}

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

@ -1,16 +1,22 @@
package com.glxp.sale.admin.controller.basic;
import com.alibaba.fastjson.JSON;
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.entity.inout.OrderEntity;
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.req.inout.OrderFilterRequest;
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.service.inout.OrderService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.FileUtils;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -41,6 +47,8 @@ public class BussinessTypeController {
private BussinessTypeService bussinessTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private OrderService orderService;
@GetMapping("/udiwms/bussinessType/filter")
public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
@ -92,6 +100,18 @@ public class BussinessTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String id = deleteRequest.getId();
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.selectById(id);
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setAction(bussinessTypeEntity.getAction());
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
if (orderEntity != null) {
return ResultVOUtils.error(500, "已存在该类型扫码单据,无法删除!");
}
if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) {
return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型,无法删除!");
}
bussinessTypeService.deleteById(id);
return ResultVOUtils.success("删除成功");
}
@ -118,7 +138,9 @@ public class BussinessTypeController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (bussinessTypeEntity != null) {
bussinessTypeEntity.setAction("SC" + CustomUtil.getId());
bussinessTypeService.insertBussinessType(bussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");
@ -137,7 +159,7 @@ public class BussinessTypeController {
return authAdmin.getCustomerId() + "";
}
//往来单位信息文件导入
//扫码单据类型导入
@PostMapping("/udiwms/busstiness/file/upload")
public BaseResponse uploadProducts(@RequestParam("file") List<MultipartFile> files) {
for (int i = 0; i < files.size(); i++) {
@ -148,20 +170,12 @@ public class BussinessTypeController {
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]);
List<BussinessTypeEntity> bussinessTypeEntities = JSON.parseArray(json, BussinessTypeEntity.class);
if (bussinessTypeEntities != null && bussinessTypeEntities.size() > 0) {
for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
bussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity);
}
}
System.out.println(json.toUpperCase(Locale.ROOT));
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "文件格式错误!");

@ -0,0 +1,99 @@
package com.glxp.sale.admin.controller.inout;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.constant.Constant;
import com.glxp.sale.admin.entity.inout.*;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.req.inout.OrderFilterRequest;
import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest;
import com.glxp.sale.admin.req.inout.UpdateExportStatusRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inout.DlOrderResponse;
import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.IOOrderStatusService;
import com.glxp.sale.admin.service.inout.OrderDetailService;
import com.glxp.sale.admin.service.inout.OrderService;
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.apache.commons.lang3.StringUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@RestController
public class IOOrderStatusController {
@Resource
private OrderService orderService;
@Resource
private CodesService codesService;
@Resource
private OrderDetailService orderDetailService;
@Resource
private IOOrderStatusService ioOrderStatusService;
@GetMapping("spms/inout/order/status")
public BaseResponse listOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) {
List<IOOrderStatusEntity> orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest);
PageInfo<IOOrderStatusEntity> pageInfo;
pageInfo = new PageInfo<>(orderStatusEntities);
PageSimpleResponse<IOOrderStatusEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(orderStatusEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("spms/inout/order/dlByStatus")
public BaseResponse dlByStatus(OrderStatusFilterRequest orderStatusFilterRequest) {
List<DlOrderResponse> dlOrderResponses = new ArrayList<>();
List<IOOrderStatusEntity> orderStatusEntities = ioOrderStatusService.filterOrderStatus(orderStatusFilterRequest);
if (orderStatusEntities != null && orderStatusEntities.size() > 0) {
for (IOOrderStatusEntity orderStatusEntity : orderStatusEntities) {
DlOrderResponse dlOrderResponse = new DlOrderResponse();
OrderEntity orderEntity = orderService.findById(orderStatusEntity.getOrderId());
dlOrderResponse.setOrderEntity(orderEntity);
List<ErpOrderEntity> orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderStatusEntity.getOrderId());
dlOrderResponse.setOrderDetails(orderDetailEntityList);
List<WarehouseEntity> codes = codesService.findByReceiptId(orderStatusEntity.getOrderId());
dlOrderResponse.setCodes(codes);
dlOrderResponses.add(dlOrderResponse);
}
}
return ResultVOUtils.success(dlOrderResponses);
}
//更新订单
@PostMapping("/spms/inout/order/deleteStatus")
public BaseResponse deleteStatus(@RequestBody OrderStatusFilterRequest orderStatusFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = ioOrderStatusService.deleteByOrderId(orderStatusFilterRequest.getOrderId());
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("更新成功");
}
@PostMapping("/spms/inout/order/updateStatus")
public BaseResponse updateStatus(@RequestBody IOOrderStatusEntity orderStatusFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = ioOrderStatusService.updateOrderStatus(orderStatusFilterRequest);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("更新成功");
}
}

@ -343,8 +343,8 @@ public class OrderController {
String mainOrder = orderList.get(0);
for (int i = 1; i < orderList.size(); i++) {
codesService.updateOrderId(orderList.get(i), mainOrder);
orderService.deleteById(orderList.get(i));
codesTempService.updateOrderId(orderList.get(i), mainOrder);
orderService.deleteById(orderList.get(i));
}
OrderEntity mainOrderEntity = orderService.findById(mainOrder);
List<String> docids = getDocids(mergeList);
@ -357,7 +357,7 @@ public class OrderController {
}
mainOrderEntity.setErpFk(docidStr);
orderService.updateOrder(mainOrderEntity);
ioTransInoutService.transStatus(mainOrderEntity.getId());
// ioTransInoutService.transStatus(mainOrderEntity.getId());
} else {
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}

@ -21,8 +21,10 @@ import com.glxp.sale.admin.req.param.SystemParamConfigRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.res.inout.PurchaseinResponse;
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@ -101,6 +103,8 @@ public class OrderDetailController {
InvProductsTrService invProductsTrService;
@Resource
IoTransInoutService ioTransInoutService;
@Resource
BussinessOriginTypeService bussinessOriginTypeService;
@GetMapping("/spms/erpOrder/filter")
public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest,
@ -227,17 +231,17 @@ public class OrderDetailController {
BeanUtils.copyProperties(thrOrderEntity, stockOrderEntity);
String billNo = CustomUtil.getId();
stockOrderEntity.setBillNo(billNo);
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderEntity.getBillType());
stockOrderEntity.setBillType(bussinessTypeEntity.getLocalAction());
BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finAllByAction(thrOrderEntity.getBillType());
stockOrderEntity.setBillType(bussinessOriginTypeResponse.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() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities =
@ -247,6 +251,10 @@ public class OrderDetailController {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
if (udiRelevanceEntity == null) {
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
}
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount() + "");
@ -257,8 +265,7 @@ public class OrderDetailController {
}
stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList);
}
}
boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
return ResultVOUtils.success();
}
@ -503,7 +510,6 @@ public class OrderDetailController {
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) {

@ -239,6 +239,7 @@ public class StockOrderDetailController {
public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
for (String id : stockOrderIdsRequest.getIds()) {
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setId(id);
@ -264,18 +265,30 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setProductId(udiInfoEntity.getRlId() + "");
stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if (stockOrderIdsRequest.getUdiEntity() != null) {
UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity();
stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo());
stockOrderDetailEntity.setCount(1 + "");
stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate());
stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate());
if (originDatas != null && originDatas.size() > 0) {
if (!isSameBatch(originDatas, stockOrderDetailEntity)) {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
stockOrderDetailEntity.setCount(0 + "");
stockOrderDetailEntity.setReCount(0 + "");
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
} else {
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
} else
stockOrderDetailEntityList.add(stockOrderDetailEntity);
}
}
if (originDatas != null && originDatas.size() > 0) {
stockOrderDetailEntityList.addAll(originDatas);
}
if (stockOrderDetailEntityList.size() == 0) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品");
@ -283,6 +296,17 @@ public class StockOrderDetailController {
return ResultVOUtils.success(stockOrderDetailEntityList);
}
public boolean isSameBatch(List<StockOrderDetailEntity> originDatas, StockOrderDetailEntity stockOrderDetailEntity) {
for (StockOrderDetailEntity temp : originDatas) {
if ((temp.getBatchNo() != null && temp.getBatchNo().equals(stockOrderDetailEntity.getBatchNo()))
&& (temp.getProductId().equals(stockOrderDetailEntity.getProductId()))) {
temp.setCount(Integer.parseInt(temp.getCount()) + Integer.parseInt(stockOrderDetailEntity.getCount()) + "");
return true;
}
}
return false;
}
@GetMapping("/udiwms/stock/order/detail/addFromCode")
public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId,
@RequestParam("count") String count,

@ -20,10 +20,13 @@ 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.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse;
import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
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.service.param.SystemPDFTemplateRelevanceService;
import com.glxp.sale.admin.thread.JaspaperService;
import com.glxp.sale.admin.util.CustomUtil;
import org.springframework.beans.BeanUtils;
@ -74,6 +77,8 @@ public class StockQRCodeTextController {
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Resource
private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
InvStockPrintService stockPrintService;
@Resource
CompanyService companyService;
@ -350,41 +355,10 @@ public class StockQRCodeTextController {
HttpServletRequest request, HttpServletResponse response) throws Exception {
/*
StockOrderEntity stockOrderEntity =
stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId());
if (stockOrderEntity == null) {
return;
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return;
stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath());
stockQRCodeTextPDFTemplateRequest.setRowCount(systemPDFTemplateEntity.getRowCount());
stockQRCodeTextPDFTemplateRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount());
//-----------------------------------------------
stockQRCodeTextPDFTemplateRequest.setOrderId(stockOrderEntity.getId());
stockQRCodeTextPDFTemplateRequest.setBillNo(stockOrderEntity.getBillNo());
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(stockOrderEntity.getBillType());
stockQRCodeTextPDFTemplateRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName());
StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId());
List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
ITextPDFUtils.exportStockOrderPDFFromTemplateFile(
stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response);
*/
/*打印订单*/
List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
if (list != null && list.size() > 0) {
int index = 1;
// List<StockOrderPrintResponse> stockOrderPrintResponses = new ArrayList<>();
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(list.get(0).getCustomerId()));
for (StockOrderPrintEntity stockOrderPrintEntity : list) {
stockOrderPrintEntity.setIndex(index + "");
@ -393,17 +367,22 @@ public class StockQRCodeTextController {
// 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.setAmount(BigDecimal.valueOf(85.36));
// stockOrderPrintEntity.setTotalPrice(BigDecimal.valueOf(1888.88));
// stockOrderPrintEntity.setTotalPriceWord("18888");
stockOrderPrintEntity.setCorpName(companyEntity.getCompanyName());
stockOrderPrintEntity.setOrderName(stockQRCodeTextPDFTemplateRequest.getOrderName());
index++;
// stockOrderPrintResponses.add(stockOrderPrintResponse);
}
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + "");
if (systemPDFModuleEntity == null) return;
SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest();
systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId());
systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType());
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponses.get(0).getTemplateId()));
if (systemPDFTemplateEntity == null) return;
Map<String, Object> data = new HashMap<String, Object>();
data.put("data", list);

@ -247,6 +247,7 @@ public class InoutUtils {
erpOrderEntity.setProductDate(erpDetailCodeEntity.getProduceDate());
erpOrderEntity.setExpireDate(erpDetailCodeEntity.getExpireDate());
erpOrderEntity.setGoodsid(erpDetailCodeEntity.getRelId());
erpOrderEntity.setBindRlFk(erpDetailCodeEntity.getRelId());
erpOrderEntity.setCount(erpDetailCodeEntity.getCount());
erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId());
erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc());

@ -226,7 +226,6 @@ public class InvProductsController {
code = filterCodeTraceRequest.getCode();
}
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setCode(code);
filterInvProductDetailRequest.setSupId(filterCodeTraceRequest.getSupId());

@ -0,0 +1,121 @@
package com.glxp.sale.admin.controller.inventory;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.entity.auth.AuthPermissionRule;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.auth.AuthPermissionRuleSaveRequest;
import com.glxp.sale.admin.req.info.DeleteRequest;
import com.glxp.sale.admin.req.inventory.FilterInvProductRequest;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse;
import com.glxp.sale.admin.res.inventory.InvProductPageRespnonse;
import com.glxp.sale.admin.res.inventory.InvProductResponse;
import com.glxp.sale.admin.res.inventory.InvWarehouseResponse;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import com.glxp.sale.admin.util.PermissionRuleTreeUtils;
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.validation.Valid;
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;
@RestController
public class InvWarehouseController {
@Resource
InvWarehouseService invWarehouseService;
@GetMapping("spms/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
List<InvWarehouseResponse> merge = merge(invWarehouseEntities, 0);
Map<String, Object> restMap = new HashMap<>();
restMap.put("list", merge);
return ResultVOUtils.success(restMap);
}
public List<InvWarehouseResponse> merge(List<InvWarehouseEntity> invWarehouseEntities,
Integer pid) {
List<InvWarehouseResponse> invWarehouseResponses = new ArrayList<>();
for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse();
BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse);
if (pid.equals(invWarehouseEntity.getPid())) {
invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId()));
invWarehouseResponses.add(invWarehouseResponse);
}
}
return invWarehouseResponses;
}
@PostMapping("/spms/inv/warehouse/save")
public BaseResponse save(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (invWarehouseEntity.getPid() == null) {
invWarehouseEntity.setPid(0); // 默认设置
}
boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success("添加成功!");
}
@PostMapping("/spms/inv/warehouse/edit")
public BaseResponse edit(@RequestBody @Valid InvWarehouseEntity invWarehouseEntity,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (invWarehouseEntity.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
invWarehouseEntity.setPid(null); // 不能修改父级 pid
boolean b = invWarehouseService.updateInvWarehouse(invWarehouseEntity);
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
@PostMapping("/spms/inv/warehouse/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
if (deleteRequest.getId() == null) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
}
boolean b = invWarehouseService.deleteById(deleteRequest.getId());
if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
}
return ResultVOUtils.success();
}
}

@ -253,7 +253,7 @@ public class PDFDawnloadController {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = systemPDFTemplateRelevanceEntityList.get(0);
SystemPDFTemplateRequest systemPDFTemplateRequest = new SystemPDFTemplateRequest();
systemPDFTemplateRequest.setId(systemPDFTemplateRelevanceEntity.getTemplate_id());
systemPDFTemplateRequest.setId(systemPDFTemplateRelevanceEntity.getTemplateId());
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.findSystemPDFTemplate(systemPDFTemplateRequest);

@ -2,15 +2,22 @@ package com.glxp.sale.admin.controller.param;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.sale.admin.req.param.SystemPDFModuleRequest;
import com.glxp.sale.admin.req.param.SystemPDFModuleSaveRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.param.SystemPDFModuleResponse;
import com.glxp.sale.admin.res.param.SystemPDFModuleSelectResponse;
import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
import com.glxp.sale.admin.res.param.SystemPDFTemplateSelectResponse;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.param.SystemPDFModuleService;
import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService;
import com.glxp.sale.admin.service.param.SystemPDFTemplateService;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
@ -33,7 +40,11 @@ public class SystemPDFModuleController {
@Resource
private SystemPDFModuleService systemPDFModuleService;
@Resource
private SystemPDFTemplateRelevanceService systemPDFTemplateRelevanceService;
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Resource
BussinessLocalTypeService bussinessLocalTypeService;
@AuthRuleAnnotation("system/pdf/module/list")
@GetMapping("/system/pdf/module/list")
@ -65,6 +76,43 @@ public class SystemPDFModuleController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/module/detail")
@GetMapping("/system/pdf/module/detail")
public BaseResponse moduleDetail(@Valid SystemPDFTemplateRelevanceRequest systemPDFModuleRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) {
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterList(bussinessLocalTypeFilterRequest);
for (BussinessLocalTypeEntity bussinessLocalTypeEntity : bussinessLocalTypeEntities) {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
systemPDFTemplateRelevanceEntity.setLocalAction(bussinessLocalTypeEntity.getAction());
systemPDFTemplateRelevanceEntity.setModuleId(systemPDFModuleRequest.getModuleId());
systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity);
}
List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceEntityList =
systemPDFTemplateRelevanceService.filterList(systemPDFModuleRequest);
return ResultVOUtils.success(systemPDFTemplateRelevanceEntityList);
}
return ResultVOUtils.success(null);
}
@AuthRuleAnnotation("system/pdf/module/update")
@PostMapping("/system/pdf/module/updateRl")
public BaseResponse updateRl(@RequestBody SystemPDFTemplateRelevanceEntity systemPDFModuleSaveRequest) {
systemPDFTemplateRelevanceService.udpateRl(systemPDFModuleSaveRequest);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("system/pdf/module/list")
@GetMapping("/system/pdf/module/pdfModules")
public BaseResponse pdfModules(@RequestParam(value = "page", defaultValue = "1") Integer page,
@ -85,6 +133,7 @@ public class SystemPDFModuleController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("system/pdf/module/save")
@PostMapping("/system/pdf/module/save")
public BaseResponse save(@RequestBody @Valid SystemPDFModuleSaveRequest systemPDFModuleSaveRequest,

@ -23,4 +23,6 @@ public interface BussinessLocalTypeDao {
boolean insertBussinessType(BussinessLocalTypeEntity bussinessTypeEntity);
boolean deleteById(@Param("id") String id);
BussinessLocalTypeEntity selectById(String id);
}

@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.basic;
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -10,4 +11,12 @@ import java.util.List;
public interface BussinessOriginTypeDao {
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
List<BussinessOriginTypeResponse> filterJoinList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
List<BussinessOriginTypeEntity> filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
}

@ -10,6 +10,7 @@ import java.util.List;
@Mapper
public interface BussinessTypeDao {
BussinessTypeEntity selectById(String id);
List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);

@ -18,6 +18,8 @@ public interface CompanyDao {
List<CompanyEntity> getSubCompany2(FilterCompanyRequest companyRequest);
List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
boolean modifyCompany(CompanyEntity companyEntity);
boolean insertCompany(CompanyEntity companyEntity);

@ -0,0 +1,23 @@
package com.glxp.sale.admin.dao.inout;
import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest;
import com.glxp.sale.admin.req.inout.WarehouseQueryRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface IOOrderStatusDao {
List<IOOrderStatusEntity> filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest);
boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity);
boolean deleteByOrderId(@Param("orderId") String orderId);
boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity);
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.dao.inventory;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InvWarehouseDao {
List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
boolean insertInvWarehouse(InvWarehouseEntity InvWarehouseEntity);
boolean updateInvWarehouse(InvWarehouseEntity InvWarehouseEntity);
InvWarehouseEntity selectById(@Param("id") String id);
boolean deleteById(@Param("id") String id);
}

@ -1,6 +1,9 @@
package com.glxp.sale.admin.dao.param;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.sale.admin.req.param.SystemPDFModuleRequest;
import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@ -9,8 +12,12 @@ import java.util.List;
@Mapper
public interface SystemPDFTemplateRelevanceDao {
List<SystemPDFTemplateRelevanceResponse> filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest);
/**
* customerId
*
* @param customerId customerId
* @return
*/
@ -18,6 +25,7 @@ public interface SystemPDFTemplateRelevanceDao {
/**
* customerId
*
* @param customerIds customerIds
* @return
*/
@ -25,6 +33,7 @@ public interface SystemPDFTemplateRelevanceDao {
/**
* template_id customer_id
*
* @param templateId templateId
* @return
*/
@ -32,6 +41,7 @@ public interface SystemPDFTemplateRelevanceDao {
/**
*
*
* @param systemPDFTemplateRelevanceEntityList
* @return
*/
@ -42,8 +52,10 @@ public interface SystemPDFTemplateRelevanceDao {
/**
* customerId
* @param customerId
*
* @return
*/
boolean deleteByCustomerId(Long customerId);
boolean deleteById(Integer id);
boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
}

@ -27,4 +27,6 @@ public class UserRegisterEntity {
private String areaCode;
private String userName;
private String licenseUrl;
private String udplatCompanyName;
private String udplatCompanyId;
}

@ -7,5 +7,9 @@ public class BussinessOriginTypeEntity {
private String id;
private String name;
private String action;
private String thirdSys;
private String thirdSysName;
private Boolean enable;
private String remark;
}

@ -0,0 +1,13 @@
package com.glxp.sale.admin.entity.inout;
import lombok.Data;
import java.util.Date;
@Data
public class IOOrderStatusEntity {
private Integer id;
private String orderId;
private Integer status;
private Date updateTime;
}

@ -31,7 +31,8 @@ public class OrderEntity {
private Integer exportStatus;
private String exportFilePath;
private Integer dlCount;
private String invStorageCode;
private String invWarehouseCode;
}

@ -24,10 +24,19 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String unitIdFk;
private String customerId;
private BigDecimal totalPrice;
public BigDecimal getPrice() {
// if (price == null)
// return new BigDecimal(0);
return price;
}
private BigDecimal price;
private BigDecimal amount;
private String title;
private String zczbhhzbapzbh;
private String index;
private String totalPriceWord;
private String orderName;
}

@ -25,7 +25,8 @@ public class WarehouseEntity {
private String customerId;
private String nameCode;
private String supId;//供应商ID
private String invStorageCode;
private String invWarehouseCode;
private String relId;
private Integer status;

@ -37,6 +37,8 @@ public class Warehousetemp {
private Integer count;
private Integer type;
private String invStorageCode;
private String invWarehouseCode;
public Long getId() {
return id;
@ -189,4 +191,20 @@ public class Warehousetemp {
public void setType(Integer type) {
this.type = type;
}
public String getInvStorageCode() {
return invStorageCode;
}
public void setInvStorageCode(String invStorageCode) {
this.invStorageCode = invStorageCode;
}
public String getInvWarehouseCode() {
return invWarehouseCode;
}
public void setInvWarehouseCode(String invWarehouseCode) {
this.invWarehouseCode = invWarehouseCode;
}
}

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

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

@ -0,0 +1,22 @@
package com.glxp.sale.admin.entity.inventory;
import lombok.Data;
import java.util.Date;
@Data
public class InvWarehouseEntity {
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Integer status;
private Date updateTime;
private String remark;
}

@ -8,8 +8,10 @@ import lombok.Data;
@Data
public class SystemPDFTemplateRelevanceEntity {
private int id;
private int template_id;
private Integer templateId;
private Long customerId;
private int admin_id;
private Integer adminId;
private Integer moduleId;
private String localAction;
}

@ -7,4 +7,7 @@ import lombok.Data;
public class BussinessOriginTypeFilterRequest extends ListPageRequest {
private String action;
private String name;
private String thirdSys;
private String thirdSysName;
private Boolean enable;
}

@ -18,4 +18,8 @@ public class FilterOrderRequest {
private String customerId;
private String status;
private Boolean isDownThrSys;
private Boolean isLocal;
private String localAction;
}

@ -22,6 +22,6 @@ public class OrderFilterRequest extends ListPageRequest {
private Integer receiveStatus;
private Integer statusOrOne;
private String customerId;
private String fromCorpId;
private String orderId;//业务单据ID手持终端上传上来的
}

@ -0,0 +1,10 @@
package com.glxp.sale.admin.req.inout;
import com.glxp.sale.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class OrderStatusFilterRequest extends ListPageRequest {
private String orderId;
private Integer status;
}

@ -1,5 +1,6 @@
package com.glxp.sale.admin.req.inout;
import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import lombok.Data;
@ -12,4 +13,5 @@ public class StockOrderIdsRequest {
List<String> ids;
boolean filterUDIType;
UdiEntity udiEntity;
List<StockOrderDetailEntity> stockOrderLists;
}

@ -20,4 +20,6 @@ public class FilterInvProductRequest extends ListPageRequest {
private String productsName;
private String supId;
private String unitFk;
private String invStorageCode;
private String invWarehouseCode;
}

@ -0,0 +1,18 @@
package com.glxp.sale.admin.req.inventory;
import com.glxp.sale.admin.req.ListPageRequest;
import lombok.Data;
import java.util.Date;
@Data
public class FilterInvWarehouseRequest extends ListPageRequest {
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Date updateTime;
}

@ -20,4 +20,6 @@ public class StockQRCodeTextPDFTemplateRequest {
private int rowCount;
private int qrcodeCount;
private List<PdfPrintCountEntity> countList;
private String orderName;
}

@ -0,0 +1,10 @@
package com.glxp.sale.admin.req.itextpdf;
import lombok.Data;
@Data
public class SystemPDFTemplateRelevanceRequest {
private Integer moduleId;
private Integer templateType;
private String localAction;
}

@ -12,5 +12,6 @@ public class FilterThrCorpRequest extends ListPageRequest {
private String thirdSys;
private String unitId;
private String name;
private String key;
List<ErpUnitsResponse> thrCorpEntities;
}

@ -0,0 +1,11 @@
package com.glxp.sale.admin.res.basic;
import lombok.Data;
@Data
public class BussinessOriginTypeResponse {
private String name;
private String action;
private String localAction;
private String thirdAction;
}

@ -0,0 +1,17 @@
package com.glxp.sale.admin.res.inout;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
import com.glxp.sale.admin.entity.inout.OrderDetailEntity;
import com.glxp.sale.admin.entity.inout.OrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import lombok.Data;
import java.util.List;
@Data
public class DlOrderResponse {
private OrderEntity orderEntity;
private List<ErpOrderEntity> orderDetails;
private List<WarehouseEntity> codes;
}

@ -23,4 +23,7 @@ public class InvProductDetailJoinResponse {
private String stockIdFk;
private String fromCorpId;
private String fromCorp;
private String invStorageCode;
private String invWarehouseCode;
}

@ -0,0 +1,25 @@
package com.glxp.sale.admin.res.inventory;
import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class InvWarehouseResponse {
private Integer id;
private Integer pid;
private String code;
private String name;
private Boolean advanceType;
private Boolean isDefault;
private Integer status;
private Date updateTime;
private String remark;
private List<InvWarehouseResponse> children;
}

@ -0,0 +1,25 @@
package com.glxp.sale.admin.res.param;
import lombok.Data;
import java.util.Date;
@Data
public class SystemPDFTemplateRelevanceResponse {
private String param;
private String fieldExplain;
private String templateDlUrl;
private Integer templateType;
private int id;
private String moduleName;
private String templateName;
private int templateId;
private String localAction;
private String localActionName;
}

@ -22,4 +22,6 @@ public interface BussinessLocalTypeService {
boolean updateBusLocalType(BussinessLocalTypeEntity bussinessTypeEntity);
boolean deleteById(String id);
BussinessLocalTypeEntity selectById(String id);
}

@ -1,14 +1,29 @@
package com.glxp.sale.admin.service.basic;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
import java.util.List;
public interface BussinessOriginTypeService {
BussinessOriginTypeEntity findByAction(String action);
List<BussinessOriginTypeEntity> filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
BussinessOriginTypeResponse finAllByAction(String action);
BasicThirdSysDetailEntity findSysByAction(String action, String key);
List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest);
boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity);
}

@ -13,6 +13,8 @@ public interface BussinessTypeService {
List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
BussinessTypeEntity selectById(String id);
BussinessTypeEntity findBTByAction(String action);
BussinessTypeEntity findBTByName(String name);

@ -79,4 +79,9 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
public boolean deleteById(String id) {
return bussinessLocalTypeDao.deleteById(id);
}
@Override
public BussinessLocalTypeEntity selectById(String id) {
return bussinessLocalTypeDao.selectById(id);
}
}

@ -2,9 +2,12 @@ package com.glxp.sale.admin.service.basic.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.basic.BussinessOriginTypeDao;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest;
import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
import org.springframework.stereotype.Service;
@ -17,6 +20,46 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic
@Resource
BussinessOriginTypeDao bussinessOriginTypeDao;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Override
public BussinessOriginTypeEntity findByAction(String action) {
BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest();
bussinessOriginTypeFilterRequest.setAction(action);
List<BussinessOriginTypeEntity> bussinessOriginTypeEntities = filterList(bussinessOriginTypeFilterRequest);
if (bussinessOriginTypeEntities != null && bussinessOriginTypeEntities.size() > 0)
return bussinessOriginTypeEntities.get(0);
return null;
}
@Override
public List<BussinessOriginTypeEntity> filterEnableList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) {
return bussinessOriginTypeDao.filterEnableList(bussinessOriginTypeFilterRequest);
}
@Override
public BussinessOriginTypeResponse finAllByAction(String action) {
BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest();
bussinessOriginTypeFilterRequest.setAction(action);
List<BussinessOriginTypeResponse> bussinessOriginTypeEntities = bussinessOriginTypeDao.filterJoinList(bussinessOriginTypeFilterRequest);
if (bussinessOriginTypeEntities != null && bussinessOriginTypeEntities.size() > 0) {
return bussinessOriginTypeEntities.get(0);
}
return null;
}
@Override
public BasicThirdSysDetailEntity findSysByAction(String action, String key) {
BussinessOriginTypeEntity bussinessOriginTypeEntity = findByAction(action);
if (bussinessOriginTypeEntity != null) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey(key, bussinessOriginTypeEntity.getThirdSys());
// basicThirdSysDetailEntity.setLocalAction(bussinessTypResponse.getLocalAction());
return basicThirdSysDetailEntity;
}
return null;
}
@Override
public List<BussinessOriginTypeEntity> filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) {
@ -30,4 +73,14 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic
List<BussinessOriginTypeEntity> data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest);
return data;
}
@Override
public boolean updateBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity) {
return bussinessOriginTypeDao.updateBusOriginType(bussinessTypeEntity);
}
@Override
public boolean insertBusOriginType(BussinessOriginTypeEntity bussinessTypeEntity) {
return bussinessOriginTypeDao.insertBusOriginType(bussinessTypeEntity);
}
}

@ -48,6 +48,13 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
return data;
}
@Override
public BussinessTypeEntity selectById(String id) {
return bussinessTypeDao.selectById(
id
);
}
@Override
public BussinessTypeEntity findBTByAction(String action) {
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();

@ -9,6 +9,10 @@ import java.util.List;
public interface CompanyService {
CompanyEntity findCompanyByUnitFk(String unitFk);
List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
CompanyEntity findCompany(Long CustomerId);
List<CompanyEntity> getSubCompany(FilterCompanyRequest commitRequest);

@ -18,6 +18,22 @@ public class CompanyServiceImpl implements CompanyService {
@Resource
CompanyDao companyDao;
@Override
public CompanyEntity findCompanyByUnitFk(String unitFk) {
FilterCompanyRequest filterCompanyRequest = new FilterCompanyRequest();
filterCompanyRequest.setUnitIdFk(unitFk);
List<CompanyEntity> companyEntities = companyDao.filterCompany(filterCompanyRequest);
if (companyEntities != null && companyEntities.size() > 0) {
return companyEntities.get(0);
}
return null;
}
@Override
public List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest) {
return companyDao.filterCompany(companyRequest);
}
@Override
public CompanyEntity findCompany(Long CustomerId) {
return companyDao.findCompany(CustomerId);

@ -0,0 +1,20 @@
package com.glxp.sale.admin.service.inout;
import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.List;
public interface IOOrderStatusService {
List<IOOrderStatusEntity> filterOrderStatus(OrderStatusFilterRequest warehouseQueryRequest);
boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity);
boolean deleteByOrderId(String orderId);
boolean updateOrderStatus(IOOrderStatusEntity warehouseEntity);
}

@ -0,0 +1,48 @@
package com.glxp.sale.admin.service.inout.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.inout.IOOrderStatusDao;
import com.glxp.sale.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.sale.admin.req.inout.OrderStatusFilterRequest;
import com.glxp.sale.admin.service.inout.IOOrderStatusService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class IOOrderStatusServiceImpl implements IOOrderStatusService {
@Resource
IOOrderStatusDao ioOrderStatusDao;
@Override
public List<IOOrderStatusEntity> filterOrderStatus(OrderStatusFilterRequest orderStatusFilterRequest) {
if (orderStatusFilterRequest == null) {
return Collections.emptyList();
}
if (orderStatusFilterRequest.getPage() != null) {
int offset = (orderStatusFilterRequest.getPage() - 1) * orderStatusFilterRequest.getLimit();
PageHelper.offsetPage(offset, orderStatusFilterRequest.getLimit());
}
return ioOrderStatusDao.filterOrderStatus(orderStatusFilterRequest);
}
@Override
public boolean insertOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) {
return ioOrderStatusDao.insertOrderStatus(ioOrderStatusEntity);
}
@Override
public boolean deleteByOrderId(String orderId) {
return ioOrderStatusDao.deleteByOrderId(orderId);
}
@Override
public boolean updateOrderStatus(IOOrderStatusEntity ioOrderStatusEntity) {
return ioOrderStatusDao.updateOrderStatus(ioOrderStatusEntity);
}
}

@ -0,0 +1,23 @@
package com.glxp.sale.admin.service.inventory;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InvWarehouseService {
List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest);
boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity);
boolean updateInvWarehouse(InvWarehouseEntity invWarehouseEntity);
InvWarehouseEntity selectById(String id);
boolean deleteById(String id);
}

@ -0,0 +1,68 @@
package com.glxp.sale.admin.service.inventory.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.sale.admin.dao.inventory.InvWarehouseDao;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.sale.admin.res.inventory.InvProductResponse;
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class InvWarehouseServiceImpl implements InvWarehouseService {
@Resource
InvWarehouseDao invWarehouseDao;
@Override
public List<InvWarehouseEntity> filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) {
return Collections.emptyList();
}
if (filterInvWarehouseRequest.getPage() != null) {
int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest);
return data;
}
@Override
public List<InvWarehouseEntity> filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
if (filterInvWarehouseRequest == null) {
return Collections.emptyList();
}
if (filterInvWarehouseRequest.getPage() != null) {
int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
}
List<InvWarehouseEntity> data = invWarehouseDao.filterGroupInvWarehouse(filterInvWarehouseRequest);
return data;
}
@Override
public boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity) {
return invWarehouseDao.insertInvWarehouse(invWarehouseEntity);
}
@Override
public boolean updateInvWarehouse(InvWarehouseEntity invWarehouseEntity) {
return invWarehouseDao.updateInvWarehouse(invWarehouseEntity);
}
@Override
public InvWarehouseEntity selectById(String id) {
return invWarehouseDao.selectById(id);
}
@Override
public boolean deleteById(String id) {
return invWarehouseDao.deleteById(id);
}
}

@ -3,10 +3,14 @@ package com.glxp.sale.admin.service.param;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.sale.admin.req.param.SystemPDFModuleRequest;
import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
import java.util.List;
public interface SystemPDFTemplateRelevanceService {
List<SystemPDFTemplateRelevanceResponse> filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest);
List<SystemPDFTemplateRelevanceEntity> listByCustomerId(Long customerId);
@ -20,6 +24,8 @@ public interface SystemPDFTemplateRelevanceService {
int insertRolesCustomerIdAll(List<Integer> templates, Long customerId);
boolean deleteByCustomerId(Long customerId);
boolean deleteByCustomerId(Integer customerId);
boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
}

@ -2,6 +2,9 @@ package com.glxp.sale.admin.service.param.impl;
import com.glxp.sale.admin.dao.param.SystemPDFTemplateRelevanceDao;
import com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity;
import com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest;
import com.glxp.sale.admin.req.param.SystemPDFModuleRequest;
import com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse;
import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService;
import org.springframework.stereotype.Service;
@ -16,8 +19,14 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
@Resource
private SystemPDFTemplateRelevanceDao systemPDFTemplateRelevanceDao;
@Override
public List<SystemPDFTemplateRelevanceResponse> filterList(SystemPDFTemplateRelevanceRequest systemPDFModuleRequest) {
return systemPDFTemplateRelevanceDao.filterList(systemPDFModuleRequest);
}
/**
* customerId id
*
* @param customerId
* @return
*/
@ -28,6 +37,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
/**
* customerId
*
* @param customerIds
* @return
*/
@ -41,6 +51,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
/**
* roleId customerId
*
* @param templateId
* @return
*/
@ -51,6 +62,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
/**
*
*
* @param systemPDFTemplateRelevanceEntityList
* @return
*/
@ -71,6 +83,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
/**
* ids customerId
*
* @param templates
* @param customerId
* @return
@ -80,7 +93,7 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
List<SystemPDFTemplateRelevanceEntity> systemPDFTemplateRelevanceEntityList = templates.stream().map(aLong -> {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity();
systemPDFTemplateRelevanceEntity.setTemplate_id(aLong);
systemPDFTemplateRelevanceEntity.setTemplateId(aLong);
systemPDFTemplateRelevanceEntity.setCustomerId(customerId);
return systemPDFTemplateRelevanceEntity;
}).collect(Collectors.toList());
@ -93,12 +106,18 @@ public class SystemPDFTemplateRelevanceServiceImpl implements SystemPDFTemplateR
/**
* customerId
*
* @param customerId
* @return
*/
@Override
public boolean deleteByCustomerId(Long customerId) {
public boolean deleteByCustomerId(Integer customerId) {
return systemPDFTemplateRelevanceDao.deleteByCustomerId(customerId);
return systemPDFTemplateRelevanceDao.deleteById(customerId);
}
@Override
public boolean udpateRl(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) {
return systemPDFTemplateRelevanceDao.udpateRl(systemPDFTemplateRelevanceEntity);
}
}

@ -76,9 +76,18 @@ public class InvProductsTrService {
CompanyService companyService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
IOOrderStatusService ioOrderStatusService;
@Async
public void genInvProducts(String orderId) {
//导入订单状态
IOOrderStatusEntity ioOrderStatusEntity = new IOOrderStatusEntity();
ioOrderStatusEntity.setStatus(1);
ioOrderStatusEntity.setUpdateTime(new Date());
ioOrderStatusEntity.setOrderId(orderId);
ioOrderStatusService.insertOrderStatus(ioOrderStatusEntity);
OrderEntity orderEntity = orderService.findById(orderId);
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_SUCCESS &&
(orderEntity.getContrastStatus() == ConstantStatus.ORDER_CHECK_SUCCESS ||

@ -271,7 +271,11 @@ public class IoTransInoutService {
}
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
if (udiRelevanceResponse == null) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "该产品信息未维护!");
return;
} else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL);
orderService.updateRemark(orderEntity.getId(), "udi码" + warehouseEntity.getCode() + "该产品不允许以使用单元入库!");
return;
@ -304,7 +308,7 @@ public class IoTransInoutService {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(warehouseEntity.getNameCode());
List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1) {
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {
warehouseEntity.setRelId(null);
warehouseEntity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
} else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {
@ -312,12 +316,15 @@ public class IoTransInoutService {
warehouseEntity.setStatus(2);
} else {
warehouseEntity.setStatus(0);
if (warehouseEntity.getRelId() == null)
warehouseEntity.setRelId(udiRelevanceEntities.get(0).getId() + "");
String originSupId = checkOriginExitSup(warehouseEntity);
String supId = null;
if (originSupId == null)
supId = checkExitSup(warehouseEntity.getRelId());
if (supId != null && !supId.equals("MUTI")) {
else
supId = originSupId;
if (supId != null) {//&& !supId.equals("MUTI")
warehouseEntity.setSupId(supId);
}
}

@ -3,11 +3,15 @@ package com.glxp.sale.admin.util;
import org.junit.Test;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.List;
public class FileUtils {
@ -60,4 +64,892 @@ public class FileUtils {
return e.getMessage();
}
}
/**
*
*/
private FileUtils() {
}
/**
* 访
*
* <b></b>
*
* @param file 访
* @since 1.0
*/
public static void touch(File file) {
long currentTime = System.currentTimeMillis();
if (!file.exists()) {
System.err.println("file not found:" + file.getName());
System.err.println("Create a new file:" + file.getName());
try {
if (file.createNewFile()) {
System.out.println("Succeeded!");
} else {
System.err.println("Create file failed!");
}
} catch (IOException e) {
System.err.println("Create file failed!");
e.printStackTrace();
}
}
boolean result = file.setLastModified(currentTime);
if (!result) {
System.err.println("touch failed: " + file.getName());
}
}
/**
* 访
*
* <b></b>
*
* @param fileName 访
* @since 1.0
*/
public static void touch(String fileName) {
File file = new File(fileName);
touch(file);
}
/**
* 访
*
* <b></b>
*
* @param files 访
* @since 1.0
*/
public static void touch(File[] files) {
for (int i = 0; i < files.length; i++) {
touch(files[i]);
}
}
/**
* 访
*
* <b></b>
*
* @param fileNames 访
* @since 1.0
*/
public static void touch(String[] fileNames) {
File[] files = new File[fileNames.length];
for (int i = 0; i < fileNames.length; i++) {
files[i] = new File(fileNames[i]);
}
touch(files);
}
/**
*
*
* @param fileName
* @return truefalse
* @since 1.0
*/
public static boolean isFileExist(String fileName) {
return new File(fileName).isFile();
}
/**
*
*
* <b>false</b>
*
* @param file
* @return truefalse
* @since 1.0
*/
public static boolean makeDirectory(File file) {
File parent = file.getParentFile();
if (parent != null) {
return parent.mkdirs();
}
return false;
}
/**
*
*
* <b>false</b>
*
* @param fileName
* @return truefalse
* @since 1.0
*/
public static boolean makeDirectory(String fileName) {
File file = new File(fileName);
return makeDirectory(file);
}
/**
*
* false
*
*
* @param directory
* @return truefalse.
* @since 1.0
*/
public static boolean emptyDirectory(File directory) {
boolean result = true;
File[] entries = directory.listFiles();
for (int i = 0; i < entries.length; i++) {
if (!entries[i].delete()) {
result = false;
}
}
return result;
}
/**
*
* false
*
*
* @param directoryName
* @return truefalse
* @since 1.0
*/
public static boolean emptyDirectory(String directoryName) {
File dir = new File(directoryName);
return emptyDirectory(dir);
}
/**
*
*
* @param dirName
* @return truefalse
* @since 1.0
*/
public static boolean deleteDirectory(String dirName) {
return deleteDirectory(new File(dirName));
}
/**
*
*
* @param dir
* @return truefalse
* @since 1.0
*/
public static boolean deleteDirectory(File dir) {
if ((dir == null) || !dir.isDirectory()) {
throw new IllegalArgumentException("Argument " + dir +
" is not a directory. ");
}
File[] entries = dir.listFiles();
int sz = entries.length;
for (int i = 0; i < sz; i++) {
if (entries[i].isDirectory()) {
if (!deleteDirectory(entries[i])) {
return false;
}
} else {
if (!entries[i].delete()) {
return false;
}
}
}
if (!dir.delete()) {
return false;
}
return true;
}
/**
*
*
* @param file
* @param filter
* @return
* @since 1.0
*/
public static File[] listAll(File file,
javax.swing.filechooser.FileFilter filter) {
ArrayList list = new ArrayList();
File[] files;
if (!file.exists() || file.isFile()) {
return null;
}
list(list, file, filter);
files = new File[list.size()];
list.toArray(files);
return files;
}
/**
*
*
* @param list
* @param filter
* @param file
*/
private static void list(ArrayList list, File file,
javax.swing.filechooser.FileFilter filter) {
if (filter.accept(file)) {
list.add(file);
if (file.isFile()) {
return;
}
}
if (file.isDirectory()) {
File files[] = file.listFiles();
for (int i = 0; i < files.length; i++) {
list(list, files[i], filter);
}
}
}
/**
* URL
*
* @param file
* @return URL
* @throws MalformedURLException
* @since 1.0
* @deprecated FiletoURLURL
* 使File.toURL
*/
public static URL getURL(File file) throws MalformedURLException {
String fileURL = "file:/" + file.getAbsolutePath();
URL url = new URL(fileURL);
return url;
}
/**
*
*
* @param filePath
* @return
* @since 1.0
*/
public static String getFileName(String filePath) {
File file = new File(filePath);
return file.getName();
}
/**
*
*
* @param fileName
* @return
* @since 1.0
*/
public static String getFilePath(String fileName) {
File file = new File(fileName);
return file.getAbsolutePath();
}
/**
* DOS/WindowsUNIX/Linux
* "\"全部换为"/"便
* "/""\"DOS/Windows
*
* @param filePath
* @return
* @since 1.0
*/
public static String toUNIXpath(String filePath) {
return filePath.replace('\\', '/');
}
/**
* UNIX
*
* @param fileName
* @return UNIX
* @see #toUNIXpath(String filePath) toUNIXpath
* @since 1.0
*/
public static String getUNIXfilePath(String fileName) {
File file = new File(fileName);
return toUNIXpath(file.getAbsolutePath());
}
/**
*
* .
*
* @param fileName
* @return
* @since 1.0
*/
public static String getTypePart(String fileName) {
int point = fileName.lastIndexOf('.');
int length = fileName.length();
if (point == -1 || point == length - 1) {
return "";
} else {
return fileName.substring(point + 1, length);
}
}
/**
*
* .
*
* @param file
* @return
* @since 1.0
*/
public static String getFileType(File file) {
return getTypePart(file.getName());
}
/**
*
*
*
* @param fileName
* @return
* @since 1.0
*/
public static String getNamePart(String fileName) {
int point = getPathLsatIndex(fileName);
int length = fileName.length();
if (point == -1) {
return fileName;
} else if (point == length - 1) {
int secondPoint = getPathLsatIndex(fileName, point - 1);
if (secondPoint == -1) {
if (length == 1) {
return fileName;
} else {
return fileName.substring(0, point);
}
} else {
return fileName.substring(secondPoint + 1, point);
}
} else {
return fileName.substring(point + 1);
}
}
/**
*
*
* ""
* "/path/"""
*
* @param fileName
* @return ""
* @since 1.0
*/
public static String getPathPart(String fileName) {
int point = getPathLsatIndex(fileName);
int length = fileName.length();
if (point == -1) {
return "";
} else if (point == length - 1) {
int secondPoint = getPathLsatIndex(fileName, point - 1);
if (secondPoint == -1) {
return "";
} else {
return fileName.substring(0, secondPoint);
}
} else {
return fileName.substring(0, point);
}
}
/**
*
* DOSUNIX
*
* @param fileName
* @return -1
* @since 1.0
*/
public static int getPathIndex(String fileName) {
int point = fileName.indexOf('/');
if (point == -1) {
point = fileName.indexOf('\\');
}
return point;
}
/**
*
* DOSUNIX
*
* @param fileName
* @param fromIndex
* @return -1
* @since 1.0
*/
public static int getPathIndex(String fileName, int fromIndex) {
int point = fileName.indexOf('/', fromIndex);
if (point == -1) {
point = fileName.indexOf('\\', fromIndex);
}
return point;
}
/**
*
* DOSUNIX
*
* @param fileName
* @return -1
* @since 1.0
*/
public static int getPathLsatIndex(String fileName) {
int point = fileName.lastIndexOf('/');
if (point == -1) {
point = fileName.lastIndexOf('\\');
}
return point;
}
/**
*
* DOSUNIX
*
* @param fileName
* @param fromIndex
* @return -1
* @since 1.0
*/
public static int getPathLsatIndex(String fileName, int fromIndex) {
int point = fileName.lastIndexOf('/', fromIndex);
if (point == -1) {
point = fileName.lastIndexOf('\\', fromIndex);
}
return point;
}
/**
*
*
* @param filename
* @return
* @since 1.0
*/
public static String trimType(String filename) {
int index = filename.lastIndexOf(".");
if (index != -1) {
return filename.substring(0, index);
} else {
return filename;
}
}
/**
*
*
*
* @param pathName
* @param fileName
* @return
* @since 1.0
*/
public static String getSubpath(String pathName, String fileName) {
int index = fileName.indexOf(pathName);
if (index != -1) {
return fileName.substring(index + pathName.length() + 1);
} else {
return fileName;
}
}
/**
*
*
*
* @param path
* @return
* @since 1.0
*/
public static final boolean pathValidate(String path) {
//String path="d:/web/www/sub";
//System.out.println(path);
//path = getUNIXfilePath(path);
//path = ereg_replace("^\\/+", "", path);
//path = ereg_replace("\\/+$", "", path);
String[] arraypath = path.split("/");
String tmppath = "";
for (int i = 0; i < arraypath.length; i++) {
tmppath += "/" + arraypath[i];
File d = new File(tmppath.substring(1));
if (!d.exists()) { //检查Sub目录是否存在
System.out.println(tmppath.substring(1));
if (!d.mkdir()) {
return false;
}
}
}
return true;
}
/**
*
*
*
* @param path
* @return
* @since 1.0
*/
public static final String getFileContent(String path) throws IOException {
String filecontent = "";
try {
File f = new File(path);
if (f.exists()) {
FileReader fr = new FileReader(path);
BufferedReader br = new BufferedReader(fr); //建立BufferedReader对象并实例化为br
String line = br.readLine(); //从文件读取一行字符串
//判断读取到的字符串是否不为空
while (line != null) {
filecontent += line + "\n";
line = br.readLine(); //从文件中继续读取一行数据
}
br.close(); //关闭BufferedReader对象
fr.close(); //关闭文件
}
} catch (IOException e) {
throw e;
}
return filecontent;
}
/**
*
*
* @param path
* @param modulecontent
* @return
* @since 1.0
*/
public static final boolean genModuleTpl(String path, String modulecontent) throws IOException {
path = getUNIXfilePath(path);
String[] patharray = path.split("\\/");
String modulepath = "";
for (int i = 0; i < patharray.length - 1; i++) {
modulepath += "/" + patharray[i];
}
File d = new File(modulepath.substring(1));
if (!d.exists()) {
if (!pathValidate(modulepath.substring(1))) {
return false;
}
}
try {
FileWriter fw = new FileWriter(path); //建立FileWriter对象并实例化fw
//将字符串写入文件
fw.write(modulecontent);
fw.close();
} catch (IOException e) {
throw e;
}
return true;
}
/**
*
*
* @param pic_path
* @return
* @since 1.0
*/
public static final String getPicExtendName(String pic_path) {
pic_path = getUNIXfilePath(pic_path);
String pic_extend = "";
if (isFileExist(pic_path + ".gif")) {
pic_extend = ".gif";
}
if (isFileExist(pic_path + ".jpeg")) {
pic_extend = ".jpeg";
}
if (isFileExist(pic_path + ".jpg")) {
pic_extend = ".jpg";
}
if (isFileExist(pic_path + ".png")) {
pic_extend = ".png";
}
return pic_extend; //返回图片扩展名
}
/**
*
*
* @param in
* @param out
* @return
* @throws Exception
*/
public static final boolean CopyFile(File in, File out) throws Exception {
try {
FileInputStream fis = new FileInputStream(in);
FileOutputStream fos = new FileOutputStream(out);
byte[] buf = new byte[1024];
int i = 0;
while ((i = fis.read(buf)) != -1) {
fos.write(buf, 0, i);
}
fis.close();
fos.close();
return true;
} catch (IOException ie) {
ie.printStackTrace();
return false;
}
}
/**
*
*
* @param infile
* @param outfile
* @return
* @throws Exception
*/
public static final boolean CopyFile(String infile, String outfile) throws Exception {
try {
File in = new File(infile);
File out = new File(outfile);
return CopyFile(in, out);
} catch (IOException ie) {
ie.printStackTrace();
return false;
}
}
/**
* contentpath
*
* @param content
* @param path
* @return
*/
public static boolean SaveFileAs(String content, String path) {
FileWriter fw = null;
try {
fw = new FileWriter(new File(path), false);
if (content != null) {
fw.write(content);
}
} catch (IOException e) {
e.printStackTrace();
return false;
} finally {
if (fw != null) {
try {
fw.flush();
fw.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return true;
}
/**
*
*/
public static byte[] readFileByBytes(String fileName) throws IOException {
FileInputStream in = new FileInputStream(fileName);
byte[] bytes = null;
try {
ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
byte[] temp = new byte[1024];
int size = 0;
while ((size = in.read(temp)) != -1) {
out.write(temp, 0, size);
}
in.close();
bytes = out.toByteArray();
} catch (Exception e1) {
e1.printStackTrace();
} finally {
if (in != null) {
in.close();
}
}
return bytes;
}
/**
*
*/
public static void readFileByChars(String fileName) {
File file = new File(fileName);
Reader reader = null;
try {
System.out.println("以字符为单位读取文件内容,一次读一个字节:");
// 一次读一个字符
reader = new InputStreamReader(new FileInputStream(file));
int tempchar;
while ((tempchar = reader.read()) != -1) {
// 对于windows下\r\n这两个字符在一起时表示一个换行。
// 但如果这两个字符分开显示时,会换两次行。
// 因此,屏蔽掉\r或者屏蔽\n。否则将会多出很多空行。
if (((char) tempchar) != '\r') {
System.out.print((char) tempchar);
}
}
reader.close();
} catch (Exception e) {
e.printStackTrace();
}
try {
System.out.println("以字符为单位读取文件内容,一次读多个字节:");
// 一次读多个字符
char[] tempchars = new char[30];
int charread = 0;
reader = new InputStreamReader(new FileInputStream(fileName));
// 读入多个字符到字符数组中charread为一次读取字符数
while ((charread = reader.read(tempchars)) != -1) {
// 同样屏蔽掉\r不显示
if ((charread == tempchars.length)
&& (tempchars[tempchars.length - 1] != '\r')) {
System.out.print(tempchars);
} else {
for (int i = 0; i < charread; i++) {
if (tempchars[i] == '\r') {
continue;
} else {
System.out.print(tempchars[i]);
}
}
}
}
} catch (Exception e1) {
e1.printStackTrace();
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e1) {
}
}
}
}
/**
*
*/
public static List<String> readFileByLines(String fileName) {
List<String> returnString = new ArrayList<String>();
File file = new File(fileName);
BufferedReader reader = null;
try {
reader = new BufferedReader(new FileReader(file));
String tempString = null;
int line = 1;
// 一次读入一行直到读入null为文件结束
while ((tempString = reader.readLine()) != null) {
// 显示行号
returnString.add(tempString);
line++;
}
reader.close();
} catch (IOException e) {
e.printStackTrace();
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e1) {
}
}
}
return returnString;
}
/**
*
*/
public static void readFileByRandomAccess(String fileName) {
RandomAccessFile randomFile = null;
try {
System.out.println("随机读取一段文件内容:");
// 打开一个随机访问文件流,按只读方式
randomFile = new RandomAccessFile(fileName, "r");
// 文件长度,字节数
long fileLength = randomFile.length();
// 读文件的起始位置
int beginIndex = (fileLength > 4) ? 4 : 0;
// 将读文件的开始位置移到beginIndex位置。
randomFile.seek(beginIndex);
byte[] bytes = new byte[10];
int byteread = 0;
// 一次读10个字节如果文件内容不足10个字节则读剩下的字节。
// 将一次读取的字节数赋给byteread
while ((byteread = randomFile.read(bytes)) != -1) {
System.out.write(bytes, 0, byteread);
}
} catch (IOException e) {
e.printStackTrace();
} finally {
if (randomFile != null) {
try {
randomFile.close();
} catch (IOException e1) {
}
}
}
}
/**
*
*
* @param fileName
* @return
*/
public static String readFileAll(String fileName) {
String encoding = "UTF-8";
File file = new File(fileName);
Long filelength = file.length();
byte[] filecontent = new byte[filelength.intValue()];
try {
FileInputStream in = new FileInputStream(file);
in.read(filecontent);
in.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
try {
return new String(filecontent, encoding);
} catch (UnsupportedEncodingException e) {
System.err.println("The OS does not support " + encoding);
e.printStackTrace();
return "";
}
}
/**
*
*/
private static void showAvailableBytes(InputStream in) {
try {
System.out.println("当前字节输入流中的字节数为:" + in.available());
} catch (IOException e) {
e.printStackTrace();
}
}
}

@ -20,13 +20,22 @@ spring.servlet.multipart.max-file-size=200MB
spring.servlet.multipart.max-request-size=200MB
server.connectionTimeout=180000
logging.level.com.glxp.sale.admin.dao=debug
logging.level.com.glxp.api.admin.dao.auth=debug
logging.level.com.glxp.api.admin.dao.basic=debug
logging.level.com.glxp.api.admin.dao.business=debug
logging.level.com.glxp.api.admin.dao.info=debug
logging.level.com.glxp.api.admin.dao.inout=debug
logging.level.com.glxp.api.admin.dao.inventory=debug
logging.level.com.glxp.api.admin.dao.thrsys=debug
# \u8F93\u51FA\u65E5\u5FD7\u5230\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684springboot.log\u6587\u4EF6\u4E2D // \u914D\u7F6E logback-spring.xml\u65F6 \u6B64\u65E5\u5FD7\u8F93\u51FA\u65B9\u5F0F\u4F1A\u88AB\u8986\u76D6\u3002
logging.file=D:/1s/udiwms/udiwms.log
#file_path=/home/anthony/udiwms
file_path=D:/1s/udiwms
#UDI\u6570\u636E\u4E0B\u8F7D
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
#UDI_SERVER_URL=http://127.0.0.1:9994
UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
#UCLOD\u670D\u52A1
#UCLOD_SERVER_URL=http://127.0.0.1:9997
#UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER

@ -23,22 +23,19 @@
<insert id="insertUserRegister" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
INSERT INTO user_register
(
nickName, password, realName,
(nickName, password, realName,
tel, mobile, userId,
email, companyName, creditNum,
area, detailAddr, bussinessStatus,
checkType, registerTime, checkTime, comments, areaCode, userName, licenseUrl, companyId
)
values
(
#{nickName},#{password},#{realName},
, udplatCompanyName, udplatCompanyId)
values (#{nickName}, #{password}, #{realName},
#{tel}, #{mobile}, #{userId},
#{email}, #{companyName}, #{creditNum},
#{area}, #{detailAddr}, #{bussinessStatus},
#{checkType}, #{registerTime}, #{checkTime},
#{comments}, #{areaCode}, #{userName}, #{licenseUrl}, #{companyId}
)
, #{udplatCompanyName}, #{udplatCompanyId})
</insert>
<update id="updateUserRegister" parameterType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
@ -68,11 +65,15 @@
</update>
<delete id="deleteById" parameterType="java.lang.Long">
delete from user_register where id = #{id}
delete
from user_register
where id = #{id}
</delete>
<delete id="deleteByCustomerId" parameterType="java.lang.Long">
delete from user_register where userId = #{userId}
delete
from user_register
where userId = #{userId}
</delete>
<select id="selectById" parameterType="java.lang.Integer"
resultType="com.glxp.sale.admin.entity.auth.UserRegisterEntity">
@ -97,7 +98,8 @@
<select id="isExit" parameterType="java.lang.String" resultType="java.lang.String">
SELECT 1
FROM user_register WHERE (
FROM user_register
WHERE (
mobile = #{phoneNum}) limit 1
</select>

@ -15,7 +15,72 @@
</if>
</where>
</select>
<select id="filterJoinList" parameterType="com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest"
resultType="com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse">
select basic_bustype_origin.name,
basic_bustype_origin.action thirdAction,
basic_bussiness_type.action,
basic_bustype_local.action localAction
from basic_bustype_origin
LEFT JOIN basic_bussiness_type on basic_bussiness_type.thirdAction = basic_bustype_origin.action
LEFT JOIN basic_bustype_local on basic_bustype_local.originAction = basic_bustype_origin.action
<where>
<if test="name != ''and name != null">
AND basic_bustype_origin.name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND basic_bustype_origin.action LIKE concat(#{action},'%')
</if>
</where>
GROUP BY basic_bustype_origin.action;
</select>
<select id="filterEnableList" parameterType="com.glxp.sale.admin.req.basic.BussinessOriginTypeFilterRequest"
resultType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity">
select * from basic_bustype_origin LEFT JOIN basic_third_sys_detail
on basic_bustype_origin.thirdSys = basic_third_sys_detail.thirdSysFk
<where>
basic_third_sys_detail.key = 'orderQueryUrl' and basic_third_sys_detail.enabled=1
<if test="name != ''and name != null">
AND name LIKE concat(#{name},'%')
</if>
<if test="action != ''and action != null">
AND action LIKE concat(#{action},'%')
</if>
</where>
</select>
<insert id="insertBusOriginType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity">
INSERT INTO basic_bustype_origin
(action, name, enable, remark, thirdSys, thirdSysName)
values (#{action},
#{name},
#{enable},
#{remark}, #{thirdSys}, #{thirdSysName})
</insert>
<update id="updateBusOriginType" parameterType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity">
UPDATE basic_bustype_origin
<trim prefix="set" suffixOverrides=",">
<if test="action != null">action = #{action},</if>
<if test="name != null">name = #{name},</if>
<if test="enable != null">enable = #{enable},</if>
<if test="thirdSys != null">thirdSys = #{thirdSys},</if>
<if test="thirdSysName != null">thirdSysName = #{thirdSysName},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -76,7 +76,6 @@
order by basic_bussiness_type.`index`
</select>
<insert id="insertBussinessType" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.basic.BussinessTypeEntity">
replace

@ -6,9 +6,33 @@
<select id="findCompany" parameterType="java.lang.Long"
resultType="com.glxp.sale.admin.entity.info.CompanyEntity">
SELECT * FROM company where customerId = #{CustomerId}
SELECT *
FROM company
where customerId = #{CustomerId}
</select>
<select id="filterCompany" parameterType="com.glxp.sale.admin.req.info.FilterCompanyRequest"
resultType="com.glxp.sale.admin.entity.info.CompanyEntity">
SELECT * FROM company
<where>
<if test="customerId != null and customerId != ''">
and parentIdFk = #{customerId}
</if>
<if test="companyName != null and companyName != ''">
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditNum != null and creditNum != ''">
and creditNum like concat('%',#{creditNum},'%')
</if>
<if test="auditStatus != null and auditStatus != ''">
and auditStatus = #{auditStatus}
</if>
<if test="unitIdFk != null and unitIdFk != ''">
and unitIdFk = #{unitIdFk}
</if>
</where>
</select>
<delete id="deleteCompany" parameterType="java.lang.Long">
delete
from company
@ -18,7 +42,9 @@
<select id="findCompanyByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.info.CompanyEntity">
SELECT * FROM company where companyName = #{companyName}
SELECT *
FROM company
where companyName = #{companyName}
</select>
<select id="getSubCompany" parameterType="com.glxp.sale.admin.req.info.FilterCompanyRequest"
@ -132,8 +158,8 @@
refEntId, entId, networkType, certIdFk, parentCompany, parentIdFk,
contactsPapersType, contactsPapersCode, registerStatus, jyxkzh, jyxkzfzjg, jyxkzyxq,
jybapzh, jybabm, fzrq, suihao, kaihuhang, kaihuzhanghao, auditStatus,
filePath,filePath2,filePath3,filePath4,unitIdFk) values
( #{companyName},
filePath, filePath2, filePath3, filePath4, unitIdFk)
values (#{companyName},
#{bussinessStatus},
#{creditNum},
#{classes},
@ -169,15 +195,16 @@
#{filePath},
#{filePath2},
#{filePath3},
#{filePath4},#{unitIdFk}
)
#{filePath4}, #{unitIdFk})
</insert>
<select id="findKey" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.info.AliKeyEntity">
SELECT
company.refEntId,company.entId,
alicert.appKey,alicert.appSecret
from company INNER JOIN alicert on company.certIdFk = alicert.id
SELECT company.refEntId,
company.entId,
alicert.appKey,
alicert.appSecret
from company
INNER JOIN alicert on company.certIdFk = alicert.id
where company.customerId = #{customerId}
</select>

@ -38,7 +38,8 @@
<insert id="insertWarehouse" keyProperty="id" parameterType="com.glxp.sale.admin.req.inout.WarehouseSaveRequest">
INSERT INTO io_codes(action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate,
serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status)
serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status,
invStorageCode,invWarehouseCode)
values (#{action},
#{mainAction},
#{code},
@ -48,7 +49,7 @@
#{fromCorpId},
#{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count},
#{packageLevel}, #{warehouseCode},
#{nameCode}, #{supId}, #{relId}, #{status})
#{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode})
</insert>
<insert id="insertWarehouses" parameterType="java.util.List">
@ -60,7 +61,7 @@
actor,
actDate,
fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,
serialNo,count,packageLevel,warehouseCode,nameCode,supId, relId,status)
serialNo,count,packageLevel,warehouseCode,nameCode,supId, relId,status,invStorageCode,invWarehouseCode)
VALUES
<foreach collection="io_codesEntities" item="item" index="index"
separator=",">
@ -80,7 +81,7 @@
,#{item.serialNo}
,#{item.count}
,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
,#{item.relId},#{item.status})
,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode})
</foreach>
</insert>
@ -158,6 +159,8 @@
<if test="count != null">count=#{count},</if>
<if test="status != null">status=#{status},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
</trim>
WHERE id=#{id}
</update>

@ -7,7 +7,9 @@
<insert id="insertCodesTemp" parameterType="java.util.List">
INSERT INTO io_codes_temp
(action, mainAction,code, corpOrderId, actor,actDate,
fromCorpId, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,count,nameCode,supId)
fromCorpId, fromCorp,
orderId,batchNo,produceDate,expireDate,serialNo,
count,nameCode,supId,invStorageCode,invWarehouseCode)
VALUES
<foreach collection="codes" item="item" index="index"
separator=",">
@ -25,7 +27,8 @@
,#{item.produceDate}
,#{item.expireDate}
,#{item.serialNo}
,#{item.count},#{item.nameCode},#{item.supId}
,#{item.count},#{item.nameCode},#{item.supId},
#{item.invStorageCode},#{item.invWarehouseCode}
)
</foreach>
</insert>
@ -35,7 +38,7 @@
parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
INSERT INTO io_codes_temp(action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
count, nameCode, supId)
count, nameCode, supId, invStorageCode, invWarehouseCode)
values (#{action},
#{mainAction},
#{code},
@ -49,7 +52,7 @@
#{produceDate},
#{expireDate},
#{serialNo},
#{count}, #{nameCode}, #{supId})
#{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode})
</insert>
<select id="findByOrderId" parameterType="com.glxp.sale.admin.req.inout.WarehouseQueryRequest"

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.inout.IOOrderStatusDao">
<select id="filterOrderStatus" parameterType="com.glxp.sale.admin.req.inout.OrderStatusFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.IOOrderStatusEntity">
select * from io_order_status
<where>
<if test="orderId != '' and orderId!=null">
and orderId = #{orderId}
</if>
<if test="status != '' and status!=null">
and status = #{status}
</if>
</where>
</select>
<insert id="insertOrderStatus" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.inout.IOOrderStatusEntity">
replace
INTO io_order_status(orderId,status,updateTime)
values(
#{orderId},
#{status},
#{updateTime}
)
</insert>
<update id="updateOrderStatus" parameterType="com.glxp.sale.admin.entity.inout.IOOrderStatusEntity">
UPDATE io_order_status
<trim prefix="set" suffixOverrides=",">
<if test="status != null">status=#{status},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
</trim>
WHERE orderId = #{orderId}
</update>
<delete id="deleteByOrderId" parameterType="Map">
DELETE
FROM io_order_status
WHERE orderId = #{orderId}
</delete>
</mapper>

@ -84,7 +84,6 @@
</select>
<delete id="deleteById" parameterType="Map">
DELETE
FROM io_order
@ -294,6 +293,13 @@
<if test="corpOrderId != '' and corpOrderId !=null">
and corpOrderId =#{corpOrderId}
</if>
<if test="action != '' and action!=null">
and `action` =#{action}
</if>
<if test="fromCorpId != '' and fromCorpId!=null">
and `fromCorpId` =#{fromCorpId}
</if>
</where>
limit 1
</select>

@ -164,6 +164,10 @@
<if test="billNo != '' and billNo !=null">
and billNo =#{billNo}
</if>
<if test="billType != '' and billType !=null">
and billType =#{billType}
</if>
<if test="customerId != '' and customerId !=null">
and customerId =#{customerId}
</if>

@ -67,11 +67,11 @@
basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
inv_pre_product.inCount,inv_pre_product.outCount
,inv_pre_product.reCount,inv_pre_product.customerId,
company.companyName,inv_pre_product.supId,inv_pre_product.unitFk
basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk
FROM inv_pre_product
inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id
inner join basic_products on basic_udirel.uuid = basic_products.uuid
inner join company on inv_pre_product.customerId=company.customerId
inner join basic_corp on inv_pre_product.supId=basic_corp.erpId
<where>
basic_products.diType=1
<if test="cpmctymc != '' and cpmctymc != null">
@ -118,12 +118,13 @@
insert INTO inv_pre_product
(productsName, nameCode, relIdFk, ggxh, batchNo,
productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
inCount, outCount, reCount, customerId, supId, unitFk)
inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode)
values (#{productsName}, #{nameCode},
#{relIdFk}, #{ggxh}, #{batchNo},
#{productionDate}, #{expireDate},
#{ylqxzcrbarmc}, #{zczbhhzbapzbh},
#{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk})
#{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk}
, #{invStorageCode}, #{invWarehouseCode})
</insert>
@ -151,6 +152,8 @@
<if test="customerId != null">customerId=#{customerId},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="unitFk != null">unitFk=#{unitFk},</if>
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
</trim>
WHERE id = #{id}
</update>

@ -94,11 +94,13 @@
parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_pre_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode)
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode
, invStorageCode, invWarehouseCode)
values (#{code},
#{productIdFk}, #{orderIdFk},
#{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime},
#{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}, #{supId},#{originCode})
#{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}
, #{supId}, #{originCode}, #{invStorageCode}, #{invWarehouseCode})
</insert>
@ -106,7 +108,8 @@
parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_pre_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode)
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode
, invStorageCode, invWarehouseCode)
values
<foreach collection="invProductDetailEntitys" item="item" index="index"
@ -116,7 +119,8 @@
#{item.productIdFk},#{item.orderIdFk},
#{item.customerId},#{item.mainAction},#{item.action},#{item.count},#{item.updateTime},
#{item.purchaseType}, #{item.batchNo}, #{item.productionDate}, #{item.expireDate},
#{item.unitFk},#{item.stockIdFk},#{item.supId},#{item.originCode}
#{item.unitFk},#{item.stockIdFk},#{item.supId},#{item.originCode}, #{item.invStorageCode},
#{item.invWarehouseCode}
)
</foreach>
@ -148,7 +152,7 @@
<update id="updateInvProductDetail" parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
UPDATE inv_pre_product_detail
<set>
<trim prefix="set" suffixOverrides=",">
<if test="code != null">code=#{code},</if>
<if test="productIdFk != null">productIdFk=#{productIdFk},</if>
<if test="customerId != null">customerId=#{customerId},</if>
@ -163,8 +167,9 @@
<if test="stockIdFk != null">stockIdFk=#{stockIdFk},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="originCode != null">originCode=#{originCode},</if>
</set>
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
</trim>
WHERE id = #{id}
</update>
<select id="statCount" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest"

@ -116,12 +116,13 @@
insert INTO inv_product
(productsName, nameCode, relIdFk, ggxh, batchNo,
productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
inCount, outCount, reCount, customerId, unitFk, supId)
inCount, outCount, reCount, customerId, unitFk, supId, invStorageCode, invWarehouseCode)
values (#{productsName}, #{nameCode},
#{relIdFk}, #{ggxh}, #{batchNo},
#{productionDate}, #{expireDate},
#{ylqxzcrbarmc}, #{zczbhhzbapzbh},
#{inCount}, #{outCount}, #{reCount}, #{customerId}, #{unitFk}, #{supId})
#{inCount}, #{outCount}, #{reCount}, #{customerId}, #{unitFk}, #{supId}
, #{invStorageCode}, #{invWarehouseCode})
</insert>
@ -149,6 +150,8 @@
<if test="customerId != null">customerId=#{customerId},</if>
<if test="unitFk != null">unitFk=#{unitFk},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
</trim>
WHERE id = #{id}
</update>

@ -94,11 +94,13 @@
parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
insert INTO inv_product_detail
(code, productIdFk, orderIdFk, customerId, mainAction, action, count, updateTime,
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId,originCode)
purchaseType, batchNo, productionDate, expireDate, unitFk, stockIdFk, supId, originCode, invStorageCode,
invWarehouseCode)
values (#{code},
#{productIdFk}, #{orderIdFk},
#{customerId}, #{mainAction}, #{action}, #{count}, #{updateTime},
#{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}, #{supId},#{originCode})
#{purchaseType}, #{batchNo}, #{productionDate}, #{expireDate}, #{unitFk}, #{stockIdFk}, #{supId},
#{originCode}, #{invStorageCode}, #{invWarehouseCode})
</insert>
@ -148,7 +150,7 @@
<update id="updateInvProductDetail" parameterType="com.glxp.sale.admin.entity.inventory.InvProductDetailEntity">
UPDATE inv_product_detail
<set>
<trim prefix="set" suffixOverrides=",">
<if test="code != null">code=#{code},</if>
<if test="productIdFk != null">productIdFk=#{productIdFk},</if>
<if test="customerId != null">customerId=#{customerId},</if>
@ -163,8 +165,9 @@
<if test="stockIdFk != null">stockIdFk=#{stockIdFk},</if>
<if test="supId != null">supId=#{supId},</if>
<if test="originCode != null">originCode=#{originCode},</if>
</set>
<if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
<if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
</trim>
WHERE id = #{id}
</update>
<select id="statCount" parameterType="com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest"

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.inventory.InvWarehouseDao">
<select id="filterInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
SELECT * FROM inv_warehouse
<where>
<if test="id != '' and id != null">
AND id = #{id}
</if>
<if test="pid != '' and pid != null">
AND pid = #{pid}
</if>
<if test="code != '' and code != null">
AND code = #{code}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test=" advanceType != null">
AND advanceType = #{advanceType}
</if>
<if test="isDefault != null">
AND isDefault = #{isDefault}
</if>
</where>
</select>
<select id="selectById" parameterType="Map"
resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
SELECT *
FROM inv_warehouse
WHERE id = #{id}
</select>
<select id="filterGroupInvWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.sale.admin.res.inventory.InvProductResponse">
SELECT * FROM inv_warehouse
<where>
<if test="id != '' and id != null">
AND id = #{id}
</if>
<if test="pid != '' and pid != null">
AND pid = #{pid}
</if>
<if test="code != '' and code != null">
AND code = #{code}
</if>
<if test="name != '' and name != null">
AND name = #{name}
</if>
<if test="advanceType != '' and advanceType != null">
AND advanceType = #{advanceType}
</if>
<if test="isDefault != '' and isDefault != null">
AND isDefault = #{isDefault}
</if>
</where>
</select>
<insert id="insertInvWarehouse" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
insert INTO inv_warehouse
(pid, code, name, advanceType, isDefault,
status, updateTime, remark)
values (#{pid}, #{code},
#{name}, #{advanceType}, #{isDefault},
#{status}, #{updateTime},
#{remark})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM inv_warehouse
WHERE id = #{id}
</delete>
<update id="updateInvWarehouse" parameterType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
UPDATE inv_warehouse
<trim prefix="set" suffixOverrides=",">
<if test="pid != null">pid=#{pid},</if>
<if test="name != null">name=#{name},</if>
<if test="code != null">code=#{code},</if>
<if test="advanceType != null">advanceType=#{advanceType},</if>
<if test="isDefault != null">isDefault=#{isDefault},</if>
<if test="status != null">status=#{status},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="remark != null">remark=#{remark},</if>
</trim>
WHERE id = #{id}
</update>
</mapper>

@ -4,11 +4,35 @@
<mapper namespace="com.glxp.sale.admin.dao.param.SystemPDFTemplateRelevanceDao">
<select id="listByCustomerId" resultType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
SELECT template_id
SELECT templateId
FROM system_pdf_template_relevance
where customerId = #{customerId}
</select>
<select id="filterList" parameterType="com.glxp.sale.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest"
resultType="com.glxp.sale.admin.res.param.SystemPDFTemplateRelevanceResponse">
select basic_bustype_local.`name` localActionName,system_pdf_template_relevance.id,
basic_bustype_local.action localAction,
templateId,
moduleId,
system_pdf_template.name templateName
from basic_bustype_local
LEFT JOIN system_pdf_template_relevance
on basic_bustype_local.action = system_pdf_template_relevance.localAction
LEFT JOIN system_pdf_template
on system_pdf_template_relevance.templateId = system_pdf_template.id
<where>
<if test="moduleId != null ">
AND `moduleId` = #{moduleId}
</if>
<if test="localAction != null ">
AND `localAction` = #{localAction}
</if>
</where>
</select>
<select id="listByCustomerIdIn" resultType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
SELECT *
FROM system_pdf_template_relevance
@ -21,33 +45,48 @@
<select id="listByTemplateId" resultType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
SELECT customerId
FROM system_pdf_template_relevance
where template_id = #{templateId}
where templateId = #{templateId}
</select>
<insert id="insertSystemPDFTemplateRelevanceAll">
INSERT INTO system_pdf_template_relevance
(template_id, customerId)
(templateId, customerId)
VALUES
<foreach collection="list" item="item" separator=",">
<if test="item.template_id != null and item.customerId != null">
(#{item.template_id}, #{item.customerId})
<if test="item.templateId != null and item.customerId != null">
(#{item.templateId}, #{item.customerId})
</if>
</foreach>
</insert>
<insert id="insert" parameterType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
INSERT INTO system_pdf_template_relevance
(template_id,customerId,admin_id)
values
(
#{template_id},
insert
ignore
INTO system_pdf_template_relevance
(templateId, customerId, adminId, moduleId, localAction)
values (
#{templateId},
#{customerId},
#{admin_id}
#{adminId},
#{moduleId},
#{localAction}
)
</insert>
<delete id="deleteByCustomerId" parameterType="java.lang.Long">
delete from system_pdf_template_relevance where customerId = #{customerId}
<update id="udpateRl" parameterType="com.glxp.sale.admin.entity.param.SystemPDFTemplateRelevanceEntity">
UPDATE system_pdf_template_relevance
<trim prefix="set" suffixOverrides=",">
<if test="templateId != null">templateId = #{templateId},</if>
<if test="customerId != null">customerId = #{customerId},</if>
<if test="adminId != null">adminId = #{adminId},</if>
<if test="moduleId != null">moduleId = #{moduleId},</if>
<if test="localAction != null">localAction=#{localAction},</if>
</trim>
WHERE id = #{id}
</update>
<delete id="deleteById" parameterType="java.lang.Integer">
delete
from system_pdf_template_relevance
where id = #{id}
</delete>
</mapper>
Loading…
Cancel
Save