二三五楼生产仓储看板

master
maxw@mesnac.com 4 months ago
parent d96785a922
commit 6ebd69a44b

@ -0,0 +1,23 @@
package com.hw.mes.board.controller;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.mes.board.service.FirstMesBorderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("firstMesBorder")
public class FirstMesBorderController {
@Autowired
private FirstMesBorderService firstMesBorderService;
/**
*
*/
@GetMapping("/elevatorStatus")
public AjaxResult elevatorStatus(){
return AjaxResult.success(firstMesBorderService.elevatorStatus());
}
}

@ -0,0 +1,45 @@
package com.hw.mes.board.controller;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.mes.board.service.FirstMesBorderService;
import com.hw.mes.board.service.FouthMesBorderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("fouthMesBorder")
public class FouthMesBorderController {
@Autowired
private FouthMesBorderService fouthMesBorderService;
/**
*
*/
@GetMapping("/elevatorStatus")
public AjaxResult elevatorStatus(){
return AjaxResult.success(fouthMesBorderService.elevatorStatus());
}
/**
*
*/
@GetMapping("/processPercentage")
public AjaxResult processPercentage(){
return AjaxResult.success(fouthMesBorderService.processPercentage());
}
/**
*
*/
@GetMapping("/weekProductInfo")
public AjaxResult weekProductInfo(){
return AjaxResult.success(fouthMesBorderService.weekProductInfo());
}
/**
*
*/
@GetMapping("energeEquiptment")
private AjaxResult energeEquiptment(){
return AjaxResult.success(fouthMesBorderService.energeEquiptment());
}
}

@ -0,0 +1,349 @@
package com.hw.mes.board.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
* record_dnb_instant
*
* @author YinQ
* @date 2023-04-07
*/
public class RecordDnbInstant extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 编号 */
private Long objid;
/** 计量设备编号 */
@Excel(name = "计量设备编号")
private String monitorId;
/** 计量设备名称 */
@Excel(name = "计量设备名称")
private String monitorName;
/** 计量设备地址 */
// @Excel(name = "计量设备地址")
private String address;
/** 采集时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date collectTime;
/** A项电压 */
@Excel(name = "A项电压")
private BigDecimal vA;
/** B项电压 */
@Excel(name = "B项电压")
private BigDecimal vB;
/** C项电压 */
@Excel(name = "C项电压")
private BigDecimal vC;
/** A项电流 */
@Excel(name = "A项电流")
private BigDecimal iA;
/** B项电流 */
@Excel(name = "B项电流")
private BigDecimal iB;
/** C项电流 */
@Excel(name = "C项电流")
private BigDecimal iC;
/** 记录时间 */
private Date recordTime;
/** 功率因数 */
@Excel(name = "功率因数")
private BigDecimal glys;
/** 正向有功 */
@Excel(name = "正向有功")
private BigDecimal zxyg;
/** 有功功率 */
@Excel(name = "有功功率")
private BigDecimal activePower;
/** 无功功率 */
@Excel(name = "无功功率")
private BigDecimal reactivePower;
/** 电耗量 */
// @Excel(name = "电耗量")
private BigDecimal consumption;
/** 采集方式 */
@Excel(name = "采集方式", dictType="collect_type")
private Long collectType;
/** 权限标识(部门) */
// @Excel(name = "权限标识", readConverterExp = "部=门")
private Long deptId;
/** 权限标识(用户) */
// @Excel(name = "权限标识", readConverterExp = "用=户")
private Long userId;
/**
*
*/
private String monitorSubset;
/**
* 线
*/
private Integer onlineState;
private String startTime;
private String endTime;
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public Integer getOnlineState() {
return onlineState;
}
public void setOnlineState(Integer onlineState) {
this.onlineState = onlineState;
}
public String getMonitorSubset() {
return monitorSubset;
}
public void setMonitorSubset(String monitorSubset) {
this.monitorSubset = monitorSubset;
}
public String getMonitorName() {
return monitorName;
}
public void setMonitorName(String monitorName) {
this.monitorName = monitorName;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public void setObjid(Long objid)
{
this.objid = objid;
}
public Long getObjid()
{
return objid;
}
public void setMonitorId(String monitorId)
{
this.monitorId = monitorId;
}
public String getMonitorId()
{
return monitorId;
}
public void setCollectTime(Date collectTime)
{
this.collectTime = collectTime;
}
public Date getCollectTime()
{
return collectTime;
}
public void setVA(BigDecimal vA)
{
this.vA = vA;
}
public BigDecimal getVA()
{
return vA;
}
public void setVB(BigDecimal vB)
{
this.vB = vB;
}
public BigDecimal getVB()
{
return vB;
}
public void setVC(BigDecimal vC)
{
this.vC = vC;
}
public BigDecimal getVC()
{
return vC;
}
public void setIA(BigDecimal iA)
{
this.iA = iA;
}
public BigDecimal getIA()
{
return iA;
}
public void setIB(BigDecimal iB)
{
this.iB = iB;
}
public BigDecimal getIB()
{
return iB;
}
public void setIC(BigDecimal iC)
{
this.iC = iC;
}
public BigDecimal getIC()
{
return iC;
}
public void setRecordTime(Date recordTime)
{
this.recordTime = recordTime;
}
public Date getRecordTime()
{
return recordTime;
}
public void setGlys(BigDecimal glys)
{
this.glys = glys;
}
public BigDecimal getGlys()
{
return glys;
}
public void setZxyg(BigDecimal zxyg)
{
this.zxyg = zxyg;
}
public BigDecimal getZxyg()
{
return zxyg;
}
public void setActivePower(BigDecimal activePower)
{
this.activePower = activePower;
}
public BigDecimal getActivePower()
{
return activePower;
}
public void setReactivePower(BigDecimal reactivePower)
{
this.reactivePower = reactivePower;
}
public BigDecimal getReactivePower()
{
return reactivePower;
}
public void setConsumption(BigDecimal consumption)
{
this.consumption = consumption;
}
public BigDecimal getConsumption()
{
return consumption;
}
public void setCollectType(Long collectType)
{
this.collectType = collectType;
}
public Long getCollectType()
{
return collectType;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
public Long getDeptId()
{
return deptId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("objid", getObjid())
.append("monitorId", getMonitorId())
.append("collectTime", getCollectTime())
.append("vA", getVA())
.append("vB", getVB())
.append("vC", getVC())
.append("iA", getIA())
.append("iB", getIB())
.append("iC", getIC())
.append("recordTime", getRecordTime())
.append("glys", getGlys())
.append("zxyg", getZxyg())
.append("activePower", getActivePower())
.append("reactivePower", getReactivePower())
.append("consumption", getConsumption())
.append("collectType", getCollectType())
.append("deptId", getDeptId())
.append("userId", getUserId())
.toString();
}
}

@ -0,0 +1,9 @@
package com.hw.mes.board.service;
import com.hw.mes.domain.WcsPlcpoint;
import java.util.List;
public interface FirstMesBorderService {
List<WcsPlcpoint> elevatorStatus();
}

@ -0,0 +1,18 @@
package com.hw.mes.board.service;
import com.hw.mes.board.domain.RecordDnbInstant;
import com.hw.mes.domain.MesProduceStatisticsDetail;
import com.hw.mes.domain.MesProductOrder;
import com.hw.mes.domain.WcsPlcpoint;
import java.util.List;
public interface FouthMesBorderService {
List<WcsPlcpoint> elevatorStatus();
List<MesProduceStatisticsDetail> processPercentage();
MesProductOrder weekProductInfo();
List<RecordDnbInstant> energeEquiptment();
}

@ -0,0 +1,19 @@
package com.hw.mes.board.service.impl;
import com.hw.mes.board.service.FirstMesBorderService;
import com.hw.mes.domain.WcsPlcpoint;
import com.hw.mes.mapper.MesProductOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class FirstMesBorderServiceImpl implements FirstMesBorderService {
@Autowired
private MesProductOrderMapper mesProductOrderMapper;
@Override
public List<WcsPlcpoint> elevatorStatus() {
return mesProductOrderMapper.elevatorStatus();
}
}

@ -0,0 +1,40 @@
package com.hw.mes.board.service.impl;
import com.hw.mes.board.domain.RecordDnbInstant;
import com.hw.mes.board.service.FirstMesBorderService;
import com.hw.mes.board.service.FouthMesBorderService;
import com.hw.mes.domain.MesProduceStatisticsDetail;
import com.hw.mes.domain.MesProductOrder;
import com.hw.mes.domain.WcsPlcpoint;
import com.hw.mes.mapper.MesProductOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class FouthMesBorderServiceImpl implements FouthMesBorderService {
@Autowired
private MesProductOrderMapper mesProductOrderMapper;
@Override
public List<WcsPlcpoint> elevatorStatus() {
return mesProductOrderMapper.elevatorStatus();
}
@Override
public List<MesProduceStatisticsDetail> processPercentage() {
return mesProductOrderMapper.orderTime();
}
@Override
public MesProductOrder weekProductInfo() {
return mesProductOrderMapper.weekProductInfo();
}
@Override
public List<RecordDnbInstant> energeEquiptment() {
return mesProductOrderMapper.energeEquiptment();
}
}

@ -34,9 +34,9 @@ public class ThirdMesBorderServiceImpl implements ThirdMesBorderService {
for (RawAmount map : maps) {
for (RawAmount decimalMap : maps1) {
RawAmount rawAmount = new RawAmount();
rawAmount.setMaterialId(map.getMaterialId());
rawAmount.setWeek(map.getWeek());
rawAmount.setInStock(map.getInStock());
if (map.getMaterialId().equals(decimalMap.getMaterialId())){
if (map.getWeek().equals(decimalMap.getWeek())){
rawAmount.setOutStock(decimalMap.getOutStock());
rawAmounts.add(rawAmount);
}

@ -36,6 +36,7 @@ public class MesProduceStatisticsDetail extends BaseEntity
/** 销售订单号 */
@Excel(name = "销售订单号")
private String saleorderCode;
private String orderCode;
/** 生产计划ID */
@Excel(name = "生产计划ID")
@ -138,6 +139,13 @@ public class MesProduceStatisticsDetail extends BaseEntity
public void setDispatchType(String dispatchType) {
this.dispatchType = dispatchType;
}
public String getOrderCode() {
return orderCode;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public Long getDispatchId() {
return dispatchId;

@ -123,6 +123,7 @@ public class MesProductOrder extends BaseEntity {
*/
@Excel(name = "完成数量")
private BigDecimal completeAmount;
private BigDecimal diffAmount;
/**
*
@ -473,6 +474,13 @@ public class MesProductOrder extends BaseEntity {
public BigDecimal getCompleteAmount() {
return completeAmount;
}
public void setDiffAmount(BigDecimal diffAmount) {
this.diffAmount = diffAmount;
}
public BigDecimal getDiffAmount() {
return diffAmount;
}
public void setReleaseTime(Date releaseTime) {
this.releaseTime = releaseTime;

@ -7,9 +7,11 @@ import java.util.Map;
import com.hw.mes.board.domain.DmsRealtimeStatusHistory;
import com.hw.mes.board.domain.RawAmount;
import com.hw.mes.board.domain.RecordDnbInstant;
import com.hw.mes.board.domain.RecordIotenvInstant;
import com.hw.mes.domain.MesProduceStatisticsDetail;
import com.hw.mes.domain.MesProductOrder;
import com.hw.mes.domain.WcsPlcpoint;
import org.apache.ibatis.annotations.Mapper;
/**
@ -129,4 +131,10 @@ public interface MesProductOrderMapper
List<MesProduceStatisticsDetail> orderTime();
String getLineThirdStatus();
List<WcsPlcpoint> elevatorStatus();
MesProductOrder weekProductInfo();
List<RecordDnbInstant> energeEquiptment();
}

@ -389,9 +389,14 @@
order by mpo.product_order_id desc
</select>
<select id="selectOrderMonth" resultType="com.hw.mes.domain.MesProductOrder">
SELECT *
FROM mes_product_order
WHERE plan_begin_time > DATE_SUB(CURDATE(), INTERVAL 1 MONTH) order by plan_begin_time desc
select
a.*,b.material_name
from
mes_product_order a left join mes_base_material_info b on a.material_id = b.material_id
where
a.plan_begin_time > DATE_SUB(CURDATE(), interval 1 month)
order by
a.plan_begin_time desc
</select>
<select id="selectLatestWorkOrder" resultType="com.hw.mes.domain.MesProductOrder">
SELECT *
@ -402,24 +407,40 @@
SELECT x.status_value FROM `hwjy-cloud`.dms_realtime_status x where x.status_name = '烘干机风机状态'
</select>
<select id="getHourProduction" resultType="java.util.Map">
select
date_format(begin_time , '%Y-%m-%d %H:00:00') as hour,
sum(instock_amount) as amount
from
wms_product_instock
where
begin_time > now() -interval 24 hour and warehouse_id = 231
group by hour order by hour asc
-- select
-- date_format(apply_date , '%Y-%m-%d %H:00:00') as hour,
-- sum(instock_amount) as amount
-- from
-- wms_product_instock
-- where
-- apply_date > now() -interval 1 month and warehouse_id = 231
-- group by hour order by hour asc
select
date_format(apply_date , '%Y-%m-%d 00:00:00') as hour,
sum(instock_amount) as amount
from
wms_product_instock
where
apply_date > now() -interval 1 month and warehouse_id = 231
group by hour order by hour asc
</select>
<select id="getDayProduction" resultType="java.util.Map">
select
date_format(begin_time , '%Y-%m-%d 00:00:00') as day,
sum(instock_amount) as instock_amount
from
wms_product_instock
where
begin_time > now() -interval 7 day and warehouse_id = 231
group by day order by day desc
-- select
-- date_format(begin_time , '%Y-%m-%d 00:00:00') as day,
-- sum(instock_amount) as instock_amount
-- from
-- wms_product_instock
-- where
-- begin_time > now() -interval 7 day and warehouse_id = 231
-- group by day order by day desc
select
date_format(apply_date , '%Y-%m-%d 00:00:00') as day,
sum(instock_amount) as instock_amount
from
wms_product_instock
where
apply_date > now() -interval 1 month and warehouse_id = 231
group by day order by day desc
</select>
<select id="dustAnalysis" resultType="com.hw.mes.board.domain.RecordIotenvInstant">
SELECT x.* FROM `hwjy-cloud`.record_iotenv_instant x order by x.collectTime desc limit 10
@ -430,7 +451,7 @@
from
dms_realtime_status_history
where
sync_time > now() - interval 7 hour
sync_time > now() - interval 1 month
and status_value = 'True'
and status_name = '烘干机风机状态'
group by hour
@ -455,7 +476,7 @@
</select>
<select id="productCompleteCount" resultType="com.hw.mes.board.domain.RawAmount">
select
x.material_id materialId,
DATE_FORMAT(apply_date , '%Y-%m-%d 00:00:00') week,
sum(x.instock_amount) inStock
from
`hwjy-cloud`.wms_raw_instock x
@ -463,11 +484,11 @@
x.warehouse_id = 311
and x.apply_date > now() - interval 1 month
group by
material_id
week
</select>
<select id="productInstockCount" resultType="com.hw.mes.board.domain.RawAmount">
select
x.material_id materialId,
DATE_FORMAT(apply_date , '%Y-%m-%d 00:00:00') week,
sum(x.real_outstock_amount) outStock
from
`hwjy-cloud`.wms_raw_outstock x
@ -475,7 +496,7 @@
x.warehouse_id = 311
and x.apply_date > now() - interval 1 month
group by
material_id
week
</select>
<select id="rawInstock" resultType="com.hw.mes.board.domain.RawAmount">
SELECT
@ -531,15 +552,56 @@
a.plan_code ,
a.product_order_id,
a.process_id,
ifnull(sum(timediff(a.plan_end_time, a.plan_begin_time)),0) / sum(a.produce_time) efficiency,b.process_name
ifnull(sum(timediff(a.plan_end_time, a.plan_begin_time)), 0) / sum(a.produce_time) efficiency,
b.process_name,
c.order_code ,
a.real_begin_time ,
a.real_end_time ,a.produce_time
from
mes_produce_statistics_detail a join mes_base_process_info b on a.process_id = b.process_id
mes_produce_statistics_detail a left
join mes_base_process_info b on
a.process_id = b.process_id
left join mes_product_order c on a.product_order_id = c.product_order_id
where
a.real_begin_time > now() - interval 1 month and a.dispatch_id = 4 group by a.process_id ,a.product_order_id,a.plan_code
a.real_begin_time > now() - interval 1 month
and a.dispatch_id = 4
group by
a.process_id ,
a.product_order_id,
a.plan_code,
a.real_begin_time ,
a.real_end_time ,
a.produce_time
</select>
<select id="getLineThirdStatus" resultType="java.lang.String">
SELECT x.status_value FROM `hwjy-cloud`.dms_realtime_status x where x.status_name = '烘干机螺旋状态'
</select>
<select id="elevatorStatus" resultType="com.hw.mes.domain.WcsPlcpoint">
SELECT x.* FROM `hwjy-cloud`.wcs_plcpoint x where x.id in (82,83,84)
</select>
<select id="weekProductInfo" resultType="com.hw.mes.domain.MesProductOrder">
select
sum(plan_amount) plan_amount,
sum(complete_amount) complete_amount,
(sum(plan_amount)-sum(complete_amount)) diffAmount
from
mes_product_order
where
release_time > now() - interval 1 week and dispatch_id = 3
</select>
<select id="energeEquiptment" resultType="com.hw.mes.board.domain.RecordDnbInstant">
select
m.monitor_name,
(max(zxyg)-min(zxyg)) zxyg
from
record_dnb_instant
left join base_monitor_info m on
m.monitor_id = record_dnb_instant.monitor_id
where
record_dnb_instant.monitor_id in ('E0004_0200', 'E0004_0300', 'E0004_0400', 'E0004_3300', 'E0004_3400', 'E0004_3500')
and record_dnb_instant.record_time > now() - interval 1 month
group by m.monitor_name
</select>
<!--查询24小时内每小时的最新一条数据-->
<!-- SELECT-->
<!-- mes_product_order.*-->

@ -14,14 +14,14 @@ public class FourthWmsBorderController {
@Autowired
private FourthWmsBorderService fouthWmsBorderService;
/**
*
*
*/
@GetMapping("/inAndOutInfo")
public AjaxResult inAndOutInfo(){
return AjaxResult.success(fouthWmsBorderService.inAndOutInfo());
}
/**
*
*
*/
@GetMapping("stockPercentage")
public AjaxResult stockPercentage(){

@ -51,7 +51,7 @@ public class FifthWmsBoardServiceImpl implements FifthWmsBorderService {
map.put("furawInStock",wmsProductInstock.getInstockAmount());
}
}
map.put("rawOutStock",list1.get(0).getOutstockAmount());
map.put("rawOutStock",list1.get(0).getRealOutstockAmount());
map.put("productInStock",list2.get(0).getInstockAmount());
map.put("productOutStock",list3.get(0).getOutstockQty());
return map;

@ -2,10 +2,7 @@ package com.hw.wms.board.service.impl;
import com.hw.wms.board.service.FirstWmsBorderService;
import com.hw.wms.board.service.FourthWmsBorderService;
import com.hw.wms.domain.MesProductOrder;
import com.hw.wms.domain.WmsProductInstock;
import com.hw.wms.domain.WmsRawInstock;
import com.hw.wms.domain.WmsRawOutstock;
import com.hw.wms.domain.*;
import com.hw.wms.mapper.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -26,14 +23,18 @@ public class FouthWmsBoardServiceImpl implements FourthWmsBorderService {
private WmsProductInstockMapper wmsProductInstockMapper;
@Autowired
private WmsProductOutstockMapper wmsProductOutstockMapper;
@Autowired
private WmsProductStockMapper wmsProductStockMapper;
@Override
public Map inAndOutInfo() {
List<WmsRawOutstock> rawOutstock = wmsRawOutstockMapper.fourthOutstockList();
List<WmsRawOutstock> inStocks = wmsRawInstockMapper.fourthInstockList();
HashMap<String, List<WmsRawOutstock>> map = new HashMap<>();
WmsRawOutstock rawOutstock = wmsRawOutstockMapper.fourthOutstockList();
WmsRawOutstock inStocks = wmsRawInstockMapper.fourthInstockList();
WmsRawOutstock product = wmsProductInstockMapper.fourthProduct();
HashMap<String, WmsRawOutstock> map = new HashMap<>();
map.put("rawOutstock",rawOutstock);
map.put("inStocks",inStocks);
map.put("product",product);
return map;
}
@ -43,6 +44,7 @@ public class FouthWmsBoardServiceImpl implements FourthWmsBorderService {
Integer nostockAmount = wmsBaseLocationMapper.selectFourthNostockLocation();
Integer fustockLocation = wmsBaseLocationMapper.selectFourthFustockLocation();
Integer noFustockLocation = wmsBaseLocationMapper.selectFourthNoFustockLocation();
List<WmsProductStock> productStocks = wmsProductStockMapper.selectFourthProductStockPercentage();
HashMap<String, Integer> map = new HashMap<>();
map.put("stockAmount",stockAmount);
map.put("nostockAmount",nostockAmount);

@ -62,10 +62,10 @@ public class SecondWmsBoardServiceImpl implements SecondWmsBorderService {
public List<WmsProductInstock> inAndOutStockInfo() {
List<WmsProductInstock> instocks = wmsProductStockMapper.selectInStock();
List<WmsProductOutstock> outstocks = wmsProductStockMapper.selectOutStock();
Map<Long,List<WmsProductOutstock>> map = outstocks.stream().collect(Collectors.groupingBy(WmsProductOutstock::getProductId));
Map<Date,List<WmsProductOutstock>> map = outstocks.stream().collect(Collectors.groupingBy(WmsProductOutstock::getDay));
for (WmsProductInstock instock : instocks) {
if (map != null&&map.keySet().size()>0) {
WmsProductOutstock wmsProductOutstock = map.get(instock.getProductId()).get(0);
WmsProductOutstock wmsProductOutstock = map.get(instock.getDay()).get(0);
instock.setOutStockAmount(wmsProductOutstock.getOutstockQty());
}else {
instock.setOutStockAmount(new BigDecimal(0));

@ -138,6 +138,7 @@ public class WmsProductOutstock extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "执行结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
private Date day;
/** 同步ERP状态(0:失败,1成功) */
@Excel(name = "同步ERP状态(0:失败,1成功)")
@ -403,6 +404,13 @@ public class WmsProductOutstock extends BaseEntity {
public Date getEndTime() {
return endTime;
}
public void setDay(Date day) {
this.day = day;
}
public Date getDay() {
return day;
}
public String getErpStatus() {
return erpStatus;

@ -3,6 +3,7 @@ package com.hw.wms.mapper;
import java.util.List;
import com.hw.wms.domain.WmsProductInstock;
import com.hw.wms.domain.WmsProductInstockDetail;
import com.hw.wms.domain.WmsRawOutstock;
/**
* ;Mapper
@ -104,4 +105,6 @@ public interface WmsProductInstockMapper
List<WmsProductInstock> productInInfo();
List<WmsProductInstock> productFirstInInfo();
WmsRawOutstock fourthProduct();
}

@ -159,4 +159,6 @@ public interface WmsProductStockMapper
int selectOpplyLocation();
BigDecimal monthInstockAmount();
List<WmsProductStock> selectFourthProductStockPercentage();
}

@ -98,7 +98,7 @@ public interface WmsRawInstockMapper
List<WmsRawOutstock> selectInAndOutInfo();
List<WmsRawOutstock> fourthInstockList();
WmsRawOutstock fourthInstockList();
List<WmsRawInstock> purchaseInfo();

@ -165,7 +165,7 @@ public interface WmsRawOutstockMapper
List<WmsRawOutstock> selectInAndOutInfo();
List<WmsRawOutstock> fourthOutstockList();
WmsRawOutstock fourthOutstockList();
List<WmsProductInstock> productOutInfo();

@ -327,4 +327,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by
day
</select>
<select id="fourthProduct" resultType="com.hw.wms.domain.WmsRawOutstock">
select
sum(x.total_amount) outstock_amount
from
`hwjy-cloud`.wms_product_stock x
where
x.warehouse_id = 431
</select>
</mapper>

@ -416,11 +416,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="todayOutstockAmount" resultType="java.math.BigDecimal">
select
ifnull(sum(outstock_qty),0) outstock_qty
ifnull(sum(outstock_qty),0)
from
wms_product_outstock
where
apply_date > now() - interval 24 hour
apply_date > now() - interval 1 month
and warehouse_id = 231
</select>
<select id="monthOutstockAmount" resultType="java.math.BigDecimal">

@ -341,7 +341,15 @@
order by wbl.loc_column asc, wbl.loc_deep desc limit #{params.limit}
</select>
<select id="totalStock" resultType="com.hw.wms.domain.WmsProductStock">
SELECT product_id,sum(total_amount) total_amount FROM `hwjy-cloud`.wms_product_stock where warehouse_id = 231 group by product_id
select
b.material_name ,
sum(a.total_amount) total_amount
from
`hwjy-cloud`.wms_product_stock a left join mes_base_material_info b on a.product_id = b.material_id
where
warehouse_id = 231
group by
material_name
</select>
<select id="selectAvailibleLocation" resultType="java.lang.Integer">
select count(1) FROM `hwjy-cloud`.wms_base_location where container_code is null and location_status =1 and warehouse_id =231
@ -356,19 +364,26 @@
select * from wms_product_outstock_detail where begin_time > now() - interval 1 month and execute_status = 3 order by begin_time asc
</select>
<select id="selectInStock" resultType="com.hw.wms.domain.WmsProductInstock">
SELECT product_id,sum(instock_amount) instock_amount FROM `hwjy-cloud`.wms_product_instock where begin_time > now() - interval 1 week and warehouse_id = 231 group by product_id
sELECT date_format(apply_date , '%Y-%m-%d 00:00:00') as day,
sum(instock_amount) instock_amount
from
`hwjy-cloud`.wms_product_instock
where
apply_date > now() - interval 1 month
and warehouse_id = 231
group by day
</select>
<select id="selectOutStock" resultType="com.hw.wms.domain.WmsProductOutstock">
select
product_id,
date_format(apply_date , '%Y-%m-%d 00:00:00') as day,
sum(outstock_qty) outstock_qty
from
`hwjy-cloud`.wms_product_outstock
where
begin_time > now() - interval 1 week
apply_date > now() - interval 1 month
and warehouse_id = 231
group by
product_id
day
</select>
<select id="selectOneWeek" resultType="java.lang.Integer">
SELECT count(1) FROM `hwjy-cloud`.wms_product_stock where instock_date > now() - interval 1 week
@ -389,18 +404,18 @@
`hwjy-cloud`.wms_product_instock
where
warehouse_id = 231
and date_format(end_time, '%Y-%m-%D') = curdate()
and apply_date > now() - interval 1 month
</select>
<select id="selectProductStockPercentage" resultType="com.hw.wms.domain.WmsProductStock">
select
product_id ,
b.material_name ,
sum(total_amount) total_amount
from
`hwjy-cloud`.wms_product_stock
`hwjy-cloud`.wms_product_stock a left join mes_base_material_info b on a.product_id = b.material_id
where
warehouse_id = 531
group by
product_id
material_name
</select>
<select id="monthInstockAmount" resultType="java.math.BigDecimal">
select
@ -409,7 +424,11 @@
`hwjy-cloud`.wms_product_instock
where
warehouse_id = 231
and end_time > now() - interval 1 month
and apply_date > now() - interval 1 month
</select>
<select id="selectFourthProductStockPercentage" resultType="com.hw.wms.domain.WmsProductStock">
</select>

@ -235,7 +235,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mbmi.material_unit_id is not null and mbmi.material_unit_id !=''
</select>
<select id="monthRawInAmount" resultType="java.math.BigDecimal">
select sum(instock_amount) inStock from wms_raw_instock where DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) and warehouse_id = 311
select
sum(instock_amount)
from
wms_raw_instock
where
apply_date > now() - interval 1 month
and warehouse_id = 311
</select>
<select id="locationStatus" resultType="com.hw.wms.domain.WmsBaseLocation">
select * from wms_base_location
@ -259,9 +265,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
or x.warehouse_id = 132) and DATE(x.apply_date) = curdate() group by x.warehouse_id
</select>
<select id="fourthInstockList" resultType="com.hw.wms.domain.WmsRawOutstock">
SELECT x.warehouse_id,sum(x.instock_amount) outstock_amount FROM `hwjy-cloud`.wms_raw_instock x where
x.warehouse_id = 431
and DATE(x.apply_date) = curdate()
select
sum(x.instock_amount) outstock_amount
from
`hwjy-cloud`.wms_raw_instock x
where
x.warehouse_id = 411
and x.apply_date > now() - interval 1 year
</select>
<select id="purchaseInfo" resultType="com.hw.wms.domain.WmsRawInstock">
select
@ -296,11 +306,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="dayRawInAmount" resultType="java.math.BigDecimal">
select
sum(instock_amount) inStock
sum(instock_amount)
from
wms_raw_instock
where
DATE_FORMAT( apply_date, '%Y%m%d' ) = DATE_FORMAT( CURDATE( ) , '%Y%m%d' ) and warehouse_id = 311
apply_date > now() - interval 1 month
and warehouse_id = 311
</select>

@ -397,10 +397,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from
wms_raw_outstock
where
DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) and warehouse_id = 311
apply_date > now() - interval 1 month and warehouse_id = 311
</select>
<select id="productPlan" resultType="com.hw.wms.domain.WmsRawOutstock">
select * from wms_raw_outstock where warehouse_id = 311 order by apply_date desc limit 100
select
a.*,b.material_name
from
wms_raw_outstock a left join mes_base_material_info b on a.material_id = b.material_id
where
a.warehouse_id = 311
order by
a.apply_date desc
limit 100
</select>
<select id="locationCount" resultType="com.hw.wms.domain.WmsRawOutstock">
select
@ -424,13 +432,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="fourthOutstockList" resultType="com.hw.wms.domain.WmsRawOutstock">
select
x.warehouse_id ,sum(x.outstock_amount) outstock_amount
sum(x.real_outstock_amount) real_outstock_amount
from
`hwjy-cloud`.wms_raw_outstock x
where
(x.warehouse_id = 411
or x.warehouse_id = 412)
and DATE(x.apply_date) = curdate() group by x.warehouse_id
x.warehouse_id = 411
and x.apply_date > now() - interval 1 year
</select>
<select id="productOutInfo" resultType="com.hw.wms.domain.WmsProductInstock">
select
@ -461,7 +468,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from
wms_raw_outstock
where
DATE_FORMAT( apply_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) and warehouse_id = 311
apply_date > now() - interval 1 month and warehouse_id = 311
</select>
</mapper>

@ -374,14 +374,14 @@
</select>
<select id="selectRawLocationPercentage" resultType="com.hw.wms.domain.WmsRawStock">
select
material_id,
b.material_name ,
sum(total_amount) total_amount
from
`hwjy-cloud`.wms_raw_stock
`hwjy-cloud`.wms_raw_stock a left join mes_base_material_info b on a.material_id = b.material_id
where
warehouse_id = 511
group by
material_id
b.material_name
</select>

Loading…
Cancel
Save