1.增加摆放位置相关功能

2.增加采购计划到货情况查询
3.增加预配盘相关页面
master
董哲奇 1 year ago
parent 76150078aa
commit be8fdba775

@ -0,0 +1,23 @@
package com.dsic.gj_erp.bean.jcsj;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
/**
*
*/
@Getter
@Setter
@TableName("dm_dwxxp")
public class DmDwxxp implements Serializable {
@MppMultiId
private String dwh;//垛位号
@MppMultiId
private String qy;//区域
}

@ -0,0 +1,52 @@
package com.dsic.gj_erp.controller.jcsj;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("dwxx")
@AllArgsConstructor
public class DmDwxxpController {
private final DmDwxxpService dwxxpService;
@PostMapping("addOrEdit")
public ResultBean<?> add(@RequestBody Map<String,List<DmDwxxp>> map){
try {
dwxxpService.saveOrEdit(map.get("add"));
dwxxpService.saveOrEdit(map.get("edit"));
}catch (Exception e){
throw new RuntimeException("同一个区域存在相同垛位号,禁止保存");
}
if (map.get("remove").size()>0){
map.get("remove").forEach(dwxxpService::deleteByMultiId);
}
return new ResultBean<>();
}
@PostMapping("remove")
public ResultBean<?> remove(@RequestBody DmDwxxp dwxxp){
dwxxpService.remove(dwxxp);
return new ResultBean<>();
}
@PostMapping("list")
public ResultBean<?> list(@RequestBody DmDwxxp dwxxp){
List<DmDwxxp> list = dwxxpService.list(Wrappers.<DmDwxxp>lambdaQuery()
.eq(StrUtil.isNotEmpty(dwxxp.getQy()), DmDwxxp::getQy, dwxxp.getQy())
);
return new ResultBean<>(list);
}
}

@ -74,6 +74,13 @@ public class EmSbjbbController {
return new ResultBean(emSbjbbs);
}
@ApiOperation(value = "所有供货商")
@PostMapping(value = "/getGhs")
public ResultBean getGhs() {
List<Map> emSbjbbs= emSbjbbService.getGhs();
return new ResultBean(emSbjbbs);
}
@ApiOperation(value = "设备分类")
@PostMapping(value = "/getSBLX")
public ResultBean getSBLX() {

@ -14,6 +14,7 @@ import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
import com.dsic.gj_erp.service.sy.SYService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -40,6 +41,11 @@ public class DmSygdMxController {
@Autowired
private EmSbcnpService emSbcnpService;
@PostMapping("cgjhdhqk")
public ResultBean<?> cgjhdhqk(@RequestBody Map<String,Object> map){
return new ResultBean<>(service.cgjhdhqk(map));
}
@RequestMapping("/getList")
@AuthFunction
public ResultBean getList(@RequestBody DmSygdMx sygd){

@ -19,4 +19,7 @@ public interface EmSbjbbRepository extends JpaRepository<EmSbjbb,String> {
@Query(nativeQuery = true,value = "SELECT szcs,sbbh,sbmc FROM EM_SBJBB where sbzt not in('04','05') or sbzt is null")
List<Map> BMMCBM();
@Query(nativeQuery = true,value = "select ghsbm,ghsqc from MSGHSJBP")
List<Map> ghs();
}

@ -0,0 +1,7 @@
package com.dsic.gj_erp.mapper.jcsj;
import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
public interface DmDwxxpMapper extends MppBaseMapper<DmDwxxp> {
}

@ -10,6 +10,7 @@ import com.dsic.gj_erp.bean.jhgk.dto.Pldto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -28,4 +29,6 @@ public interface DmSygdMxMapper extends BaseMapper<DmSygdMx> {
int setParent();
List<Kwdto> getkw(@Param("begin") String begin, @Param("end") String end);
List<Pldto> getPl(@Param("begin") String begin,@Param("end") String end);
List<Object> cgjhdhqk(Map<String,Object> map);
}

@ -31,6 +31,8 @@ public interface EmSbjbbService extends IService<EmSbjbb> {
List<Map> getGYS();
List<Map> getGhs();
List<Map> getSBLX();
Map<String,List<Map>> getBMMCBM();

@ -0,0 +1,21 @@
package com.dsic.gj_erp.service.jcsj.impl;
import com.dsic.gj_erp.bean.jcsj.DmDwxxp;
import com.dsic.gj_erp.mapper.jcsj.DmDwxxpMapper;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
@Transactional(rollbackFor = Exception.class)
public void saveOrEdit(List<DmDwxxp> list){
this.saveOrUpdateBatchByMultiId(list);
}
public void remove(DmDwxxp dwxxp){
baseMapper.deleteByMultiId(dwxxp);
}
}

@ -89,6 +89,11 @@ public class EmSbjbbServiceImpl extends ServiceImpl<EmSbjbbMapper, EmSbjbb> impl
return emSbjbbs;
}
public List<Map> getGhs() {
List<Map> emSbjbbs=emSbjbbRepository.ghs();
return emSbjbbs;
}
@Override
public List<Map> getSBLX() {
List<Map> emSbjbbs=emSbjbbRepository.sblx();

@ -26,4 +26,6 @@ public interface DmSygdMxService extends IService<DmSygdMx> {
List<Tzjhdto> getTZList(List<DmSygdMx> list);
List<Dhdto> getDhList(List<DmSygdMx> list);
ResultBean tqSygd();
Object cgjhdhqk(Map<String,Object> map);
}

@ -58,6 +58,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
@Resource
private DmSygdMxLjServiceImpl ljService;
/**
*
*/
public Object cgjhdhqk(Map<String,Object> map){
return baseMapper.cgjhdhqk(map);
}
/**
*
* BOM

@ -347,4 +347,128 @@
,dm_sygd_mx.PL
</select>
<!-- 采购计划到货情况 -->
<select id="cgjhdhqk" resultType="map">
SELECT (MS_DDMXP.CGFLM) AS CGFLM,
(MS_DDMXP.DDH) AS DDH,
MS_DDMXP.DDXH ,
(MS_DDMXP.WPH) AS WPH,
(MS_DDMXP.JLDW) AS JLDW,
MS_DDMXP.DHSL ,
MS_DDMXP.DDDJ ,
MS_DDMXP.SJDJ ,
(MS_DDMXP.JHRQ) AS JHRQ,
MS_DDMXP.CGAQ,
(MS_DDMXP.DHRQ) AS DHRQ,
(MS_DDMXP.DGH) AS DGH,
(MS_DDMXP.BZDW) AS BZDW,
MS_DDMXP.BZL ,
MS_DDMXP.SDSL ,
(MS_DDMXP.FKBS) AS FKBS,
(MS_DDMXP.XGR) AS XGR,
(MS_DDMXP.XGRQ) AS XGRQ,
(MS_DDMXP.MFBS) AS MFBS,
(MS_DDMXP.DYWPH) AS DYWPH,
(MS_DDMXP.JHLSH) AS JHLSH,
MS_DDMXP.JHXH,
MS_DDMXP.RWDH AS RWDH,
(MS_DDMXP.FPZT) AS FPZT,
(MS_DDMXP.DHZT) AS DHZT,
(MS_DDMXP.DC_CH) AS DC_CH,
(MS_DDMXP.DC_CM) AS DC_CM,
(MS_DDMXP.DC_PL) AS DC_PL,
(MS_DDMXP.DC_FD) AS DC_FD,
(MS_DDMXP.CLZT) AS CLZT,
(MS_DDMXP.JLDW1) AS JLDW1,
MS_DDMXP.DHSL1,
MS_DDMXP.WPHD,
MS_DDMXP.WPKD,
MS_DDMXP.WPCD,
dm_wpjbp.wpgg AS RKGG,
dm_wpjbp.wpxh AS RKXH,
(MS_DDMXP.YLZD1) AS YLZD1,
MS_DDMXP.ylzd4,
MS_DDMXP.ylzd5,
MS_DDMXP.ylzd6,
MS_DDMXP.DHJE ,
MS_DDMXP.CD,
MS_DDMXP.DZ,
dm_wpjbp.wpmc as wpmc,
DDYFDJ,
0.00 as ddyfje_hj,
DHSLN ,
DHSL1N ,
DHJEN ,
im_rkrk.hdsl as lszrk,
im_rkrk.hdsl*convert(decimal(10,1) , convert(decimal(10,1),left(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)-1)) * convert(integer,substring(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1 ,charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) - charindex('*',DM_WPJBP.WPGG,1)- 1 )) / 1000 * convert(integer,right(DM_WPJBP.WPGG,len(DM_WPJBP.WPGG )- charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) )) * 7.85 /1000000) as lszrkzl,
MS_DDMXP.DHSL - isnull(im_rkrk.hdsl,0) as lszrk_tj,
MS_DDMXP.DHSL1 - isnull(im_rkrk.hdsl*convert(decimal(10,1) , convert(decimal(10,1),left(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)-1)) * convert(integer,substring(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1 ,charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) - charindex('*',DM_WPJBP.WPGG,1)- 1 )) / 1000 * convert(integer,right(DM_WPJBP.WPGG,len(DM_WPJBP.WPGG )- charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) )) * 7.85 /1000000),0) as lszrkzl_tj,
im_ckck.hdsl as lszck,
im_ckck.hdsl*convert(decimal(10,1) , convert(decimal(10,1),left(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)-1)) * convert(integer,substring(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1 ,charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) - charindex('*',DM_WPJBP.WPGG,1)- 1 )) / 1000 * convert(integer,right(DM_WPJBP.WPGG,len(DM_WPJBP.WPGG )- charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) )) * 7.85 /1000000) as lszckzl,
MS_DDMXP.DHSL - isnull(im_ckck.hdsl,0) as lszck_tj,
MS_DDMXP.DHSL1 - isnull(im_ckck.hdsl*convert(decimal(10,1) , convert(decimal(10,1),left(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)-1)) * convert(integer,substring(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1 ,charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) - charindex('*',DM_WPJBP.WPGG,1)- 1 )) / 1000 * convert(integer,right(DM_WPJBP.WPGG,len(DM_WPJBP.WPGG )- charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) )) * 7.85 /1000000),0) as lszckzl_tj,
im_kckc.hdsl as kcsl,
isnull(im_kckc.hdsl*convert(decimal(10,1) , convert(decimal(10,1),left(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)-1)) * convert(integer,substring(DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1 ,charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) - charindex('*',DM_WPJBP.WPGG,1)- 1 )) / 1000 * convert(integer,right(DM_WPJBP.WPGG,len(DM_WPJBP.WPGG )- charindex('*',DM_WPJBP.WPGG,charindex('*',DM_WPJBP.WPGG,1)+1) )) * 7.85 /1000000),0) as kczl,
MS_DDJBP.wjwz,
MS_DDJBP.dzwz,
MS_DDJBP.ddmc,
MS_DDJBP.ghsbm,
MS_DDJBP.ddh,
MS_DDJBP.sxrq,
MS_DDJBP.lrr as cgy,
0 as xh_gs,
0.000 as xh_zl,
0.00 as xh_je,
0 as yg_gs,
0.000 as gy_zl,
0.00 as yg_je,
0.00 as yg_jece,
'' as fph,
'' as fpbs,
'' as rkbs,
'' as ckbs,
'' as rkzt,
'' as ckzt
FROM MS_DDMXP
left join dm_wpjbp on(MS_DDMXP.wph = dm_wpjbp.wph)
join MS_DDJBP on((MS_DDJBP.CGFLM) = (MS_DDMXP.CGFLM) AND (MS_DDJBP.ddh) = (MS_DDMXP.ddh) AND (MS_DDJBP.CGFLM) = '01' AND (MS_DDJBP.DDLX) = 'B')
left join(select im_crklsz.DC_FD,im_crklsz.GCDDH,
sum(im_crklsz.HDSL) as hdsl,
round(sum(im_crklsz.KCSL*im_crklsz.jg/1000),3) as hdsl1
from im_crklsz
where im_crklsz.CKH = '01' and im_crklsz.HDLX &lt;&gt; '99' and im_crklsz.CRKBS = 'RK'
group by im_crklsz.DC_FD,im_crklsz.GCDDH) as im_rkrk on(MS_DDJBP.ddmc = im_rkrk.DC_FD and MS_DDMXP.dc_ch = im_rkrk.GCDDH)
left join(select im_crklsz.DC_FD,im_crklsz.GCDDH,
sum(im_crklsz.HDSL) as hdsl,
round(sum(im_crklsz.KCSL*im_crklsz.jg/1000),3) as hdsl1
from im_crklsz
where im_crklsz.CKH = '01' and im_crklsz.HDLX &lt;&gt; '99' and im_crklsz.CRKBS = 'CK'
group by im_crklsz.DC_FD,im_crklsz.GCDDH) as im_ckck on(MS_DDJBP.ddmc = im_ckck.DC_FD and MS_DDMXP.dc_ch = im_ckck.GCDDH)
left join(select IM_CKWPKWP.DC_FD,IM_CKWPKWP.GCDDH,
sum(IM_CKWPKWP.qxkcl) as hdsl,
0 as hdsl1
from IM_CKWPKWP
where IM_CKWPKWP.CKH = '01'
group by IM_CKWPKWP.DC_FD,IM_CKWPKWP.GCDDH) as im_kckc on(MS_DDJBP.ddmc = im_kckc.DC_FD and MS_DDMXP.dc_ch = im_kckc.GCDDH)
WHERE (MS_DDMXP.CGFLM) = '01'
<if test="ghsbm != null and ghsbm!=''">
and MS_DDMXP.ghsbm=#{ghsbm}
</if>
<if test="wjwz != null and wjwz!=''">
and MS_DDJBP.wjwz=#{wjwz}
</if>
<if test="ddmc != null and ddmc!=''">
and MS_DDJBP.ddmc=#{ddmc}
</if>
<if test="xhth != null and xhth!=''">
and MS_DDMXP.dc_ch=#{xhth}
</if>
<if test="ksrq != null and ksrq!=''">
and MS_DDJBP.sxrq&gt;=#{ksrq}
</if>
<if test="jsrq != null and jsrq!=''">
and MS_DDJBP.sxrq&lt;=#{jsrq}
</if>
</select>
</mapper>

Loading…
Cancel
Save