Skip to content

J
jyzb_platformV2
Commit 8633bf74 by 李小惠
Options

修改单据单号以及排序

parent f0687888
正在显示 包含 43 行增加 和 48 行删除
.gitignore
......@@ -112,3 +112,4 @@ Thumbs.db
/jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java.orig
/jyzb-biz/pom.xml
/.idea/compiler.xml
/jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentSizeDto.java
......@@ -74,4 +74,6 @@ public class EquipmentSizeDto {
*/
private Integer state;
private String photo;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrderMainDto.java
......@@ -73,7 +73,7 @@ public class OrderMainDto implements Serializable {
private String manufacturerId;
/**
* 调拨类型（0支拨，1价拨），调拨出入库才有
* 调拨类型（2支拨，1价拨），调拨出入库才有
*/
private Integer transferType;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java
......@@ -90,7 +90,7 @@ public class OrderMainReq extends BaseRequest {
private String manufacturerId;
/**
* 调拨类型（0支拨，1价拨），调拨出入库才有
* 调拨类型（2支拨，1价拨），调拨出入库才有
*/
private Integer transferType;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java
......@@ -25,4 +25,6 @@ public class UpdateEquipmentSizeReq {
private BigDecimal price;
@NotBlank(message = "状态值不能为空", groups = {ValidationApi.updateStatus.class})
private String state;
private String photo;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateOrderReq.java
......@@ -61,7 +61,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
/**
* 发物单位负责人id
*/
@IsNumber(message = "startOrgUserId必须是数字",groups = {add.class})
// @IsNumber(message = "startOrgUserId必须是数字",groups = {add.class})
private String startOrgUserId;
/**
* 发物单位负责人姓名
......@@ -116,7 +116,7 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
private String manufacturerId;
/**
* 调拨类型（0支拨，1价拨），调拨出入库才有
* 调拨类型（2支拨，1价拨），调拨出入库才有
*/
private Integer transferType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BusForm.java
......@@ -125,7 +125,7 @@ public class BusForm implements Serializable {
private String applyUser;
/**
* 调拨类型（0支拨，1价拨）
* 调拨类型（2支拨，1价拨）
*/
@TableField(value = "transfer_type")
private Integer transferType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentSize.java
......@@ -79,5 +79,7 @@ public class EquipmentSize implements Serializable {
@TableField("epc_type")
private Integer epcType;
private String photo;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java
......@@ -113,7 +113,7 @@ public class EquipmentType implements Serializable {
@ApiModelProperty(value = "物资阈值")
private Integer threshold;
private String photo;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderDetail.java
......@@ -25,22 +25,22 @@ import java.util.Date;
@TableField("type")
private String type;
@TableField("equipment_type")
@TableField("type_id")
private String typeId;
@TableField("equipment_type_name")
@TableField("type_name")
private String typeName;
@TableField("equipment_size")
@TableField("size_id")
private String sizeId;
@TableField("equipment_size_name")
@TableField("size_name")
private String sizeName;
@TableField("equipment_supplier")
@TableField("supplier_id")
private String supplierId;
@TableField("equipment_supplier_name")
@TableField("supplier_name")
private String supplierName;
@TableField("warehouse_id")
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java
......@@ -115,7 +115,7 @@ public class OrderMain implements Serializable {
private String manufacturerId;
/**
* 调拨类型（0支拨，1价拨）
* 调拨类型（2支拨，1价拨）
*/
@TableField("transfer_type")
private Integer transferType;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderNum.java
......@@ -29,10 +29,6 @@ public class OrderNum implements Serializable {
private Integer year;
private Integer month;
private Integer day;
@TableField("start_org_id")
private Long startOrgId;
......@@ -51,9 +47,5 @@ public class OrderNum implements Serializable {
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
/**
* 盘库特有
*/
private Long orgId;
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
......@@ -343,7 +343,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
String orgName = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>().eq(PubOrg::getOrgId, inventory.getOrgId())).getOrgName();
inventoryDto.setOrgName(orgName);
//查询图片并返回
String photo = equipmentTypeService.getById(inventory.getTypeId()).getPhoto();
String photo = equipmentSizeService.getById(inventory.getSizeId()).getPhoto();
inventoryDto.setPhoto(photo);
return inventoryDto;
}).collect(Collectors.toList());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.entity.EquipmentSize;
import com.junmp.jyzb.entity.EquipmentType;
import com.junmp.jyzb.entity.Inventory;
import com.junmp.jyzb.entity.InventorySummary;
......@@ -37,7 +38,7 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
private InventorySummaryMapper inventorySummaryMapper;
@Resource
private EquipmentTypeService equipmentTypeService;
private EquipmentSizeService equipmentSizeService;
//根据条件查询库存汇总信息
@Override
......@@ -59,7 +60,7 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
.eq(Inventory::getTypeId, data.getTypeId())).get(0);
data.setWarrantyPeriod(inventory.getWarrantyPeriod());
data.setMaintenancePeriod(inventory.getMaintenancePeriod());
String photo = equipmentTypeService.getOne(new LambdaQueryWrapper<EquipmentType>().eq(EquipmentType::getId,inventory.getTypeId())).getPhoto();
String photo = equipmentSizeService.getOne(new LambdaQueryWrapper<EquipmentSize>().eq(EquipmentSize::getId,inventory.getSizeId())).getPhoto();
data.setPhoto(photo);
return data;
}).collect(Collectors.toList());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
......@@ -95,7 +95,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//设置单据单号
OrderNum orderNum = setOrderCode(req);
String codeValue=String.format("%04d",orderNum.getNum());
order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+orderNum.getMonth()+"-"+orderNum.getDay()+"-"+codeValue);
order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
//设置总价格和应出入库数量
//设置id
String id=UUID.randomUUID().toString();
......@@ -147,8 +148,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
OrderNum orderNum = new OrderNum();
//获取年,月，日，获取业务出入状态，获取组织机构id，获取业务类型
orderNum.setYear(LocalDateTime.now().getYear());
orderNum.setMonth(LocalDateTime.now().getMonth().getValue());
orderNum.setDay(LocalDateTime.now().getDayOfMonth());
//将业务类型转为中文简写
String itemValue = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
.eq(SysDictItem::getItemText, req.getBussinessType())).getItemValue();
......@@ -163,8 +162,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
.eq(OrderNum::getEndOrgId, orderNum.getEndOrgId())
.eq(OrderNum::getBussinessType, orderNum.getBussinessType())
.eq(OrderNum::getYear, orderNum.getYear())
.eq(OrderNum::getMonth, orderNum.getMonth())
.eq(OrderNum::getDay, orderNum.getDay())
.eq(OrderNum::getOutInType, orderNum.getOutInType()));
}else {
orderNum.setStartOrgId(Long.valueOf(req.getStartOrgId()));
......@@ -172,12 +169,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
.eq(OrderNum::getStartOrgId, orderNum.getStartOrgId())
.eq(OrderNum::getBussinessType,orderNum.getBussinessType())
.eq(OrderNum::getYear, orderNum.getYear())
.eq(OrderNum::getMonth, orderNum.getMonth())
.eq(OrderNum::getDay, orderNum.getDay())
.eq(OrderNum::getOutInType, orderNum.getOutInType()));
}
//设置num的数量
if (ObjectUtil.isNull(one)){
orderNum.setNum(1);
......@@ -356,11 +350,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) && !req.getOrder().trim().isEmpty()) {
//修改字段，和数据库字段进行统一
req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
// list=orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
// .eq(OrderDetail::getOrderId, req.getId())
// .orderBy(true,OrderItem.asc())
// .orderBy(true);
list=orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
.eq(OrderDetail::getOrderId, req.getId())
.last("order by "+req.getColumn() +" "+req.getOrder()));
} else {
......@@ -519,6 +511,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
@Override
public void InOrderExport(OrderMainReq req) {
LambdaQueryWrapper<OrderMain> wrapper = createWrapper(req);
System.out.println("list(wrapper).size() = " + list(wrapper).size());
List<InOrderInfo> collect = list(wrapper).stream().map(orderMain -> {
InOrderInfo inOrderInfo = new InOrderInfo();
BeanPlusUtil.copyProperties(orderMain, inOrderInfo);
......@@ -542,6 +535,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
for (int i = 1; i <= collect.size() ; i++) {
collect.get(i-1).setNumId(i);
}
System.out.println("collect.size() = " + collect.size());
System.out.println("collect = " + collect);
HttpServletResponse response = HttpServletUtil.getResponse();
ExcelExportParam param = new ExcelExportParam();
param.setDataList(collect);
......@@ -606,9 +601,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
if (ObjectUtil.isEmpty(req)) {
return wrapper;
}
//单据类型（in入库，out出库）
wrapper.eq(ObjectUtil.isNotEmpty(req.getOrderType()),OrderMain::getOrderType,req.getOrderType());
//单据状态 ready待入/出库，finished已入/出库，working入/出库中
wrapper.eq(ObjectUtil.isNotEmpty(req.getOrderState()), OrderMain::getOrderState, req.getOrderState());
//审核状态:none,未接入审核流，working审批中，finished已完成
// //审核状态:none,未接入审核流，working审批中，finished已完成
wrapper.eq(ObjectUtil.isNotEmpty(req.getExamineState()), OrderMain::getExamineState, req.getExamineState());
//业务类型
wrapper.eq(ObjectUtil.isNotEmpty(req.getBussinessType()), OrderMain::getBussinessType, req.getBussinessType());
......@@ -616,7 +613,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
wrapper.eq(ObjectUtil.isNotEmpty(req.getEndOrgId()),OrderMain::getEndOrgId,req.getEndOrgId());
//组织机构id（出库单）
wrapper.ge(ObjectUtil.isNotNull(req.getStartTime()),OrderMain::getCreateTime,req.getStartTime());
wrapper.le(ObjectUtil.isNotNull(req.getStartTime()),OrderMain::getCreateTime,req.getStartTime());
wrapper.le(ObjectUtil.isNotNull(req.getEndTime()),OrderMain::getCreateTime,req.getEndTime());
wrapper.orderByDesc(OrderMain::getCreateTime);
return wrapper;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/StocktakeServiceImpl.java
......@@ -52,7 +52,8 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
//设置单号
OrderNum orderNum = setOrderCode(req);
String codeValue=String.format("%04d",orderNum.getNum());
stocktake.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+orderNum.getMonth()+"-"+orderNum.getDay()+"-"+codeValue);
stocktake.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+
LocalDateTime.now().getMonth().getValue()+"-"+LocalDateTime.now().getDayOfMonth()+"-"+codeValue);
//如果盘库类型为1：根据货架进行盘点，判断参数排列行是否进行传递，如果传递则需要进行一个参数拼接
String shelfLocation="";
if (ObjectUtil.isNotNull(req.getShelfRanges()) && !req.getShelfRanges().toString().trim().isEmpty()) {
......@@ -111,20 +112,16 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
OrderNum orderNum = new OrderNum();
//获取年,月，日，获取组织机构id，获取业务类型
orderNum.setYear(LocalDateTime.now().getYear());
orderNum.setMonth(LocalDateTime.now().getMonth().getValue());
orderNum.setDay(LocalDateTime.now().getDayOfMonth());
orderNum.setBussinessType(req.getBussinessType());
orderNum.setOrgId(req.getOrgId());
// orderNum.setOrgId(req.getOrgId());
//将业务类型转为中文简写
String itemValue = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
.eq(SysDictItem::getItemText, req.getBussinessType())).getItemValue();
orderNum.setBussinessType(itemValue);
OrderNum one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
.eq(OrderNum::getOrgId, orderNum.getOrgId())
// .eq(OrderNum::getOrgId, orderNum.getOrgId())
.eq(OrderNum::getBussinessType, orderNum.getBussinessType())
.eq(OrderNum::getYear, orderNum.getYear())
.eq(OrderNum::getMonth, orderNum.getMonth())
.eq(OrderNum::getDay, orderNum.getDay()));
.eq(OrderNum::getYear, orderNum.getYear()));
//设置num的数量
if (ObjectUtil.isNull(one)){
orderNum.setNum(1);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论