bonus
/
gz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待发货接口

This commit is contained in:
haozq 2024-11-09 17:26:56 +08:00
parent 73bee619f6
commit 52ab650831
10 changed files with 79 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml
View File

@ -8,5 +8,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

8
.idea/modules.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/../gz_gqj.iml" filepath="$PROJECT_DIR$/../gz_gqj.iml" />
</modules>
</component>
</project>

12
src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java
View File

@ -137,6 +137,18 @@ public class PlanOutController {
return pageInfo;
}
/**
* X详情接口
* @param dto
* @return
*/
@GetMapping("getDfhList")
@DecryptAndVerify(decryptedClass = ProNeedInfo.class)
public PageInfo<ProNeedInfo> getDfhList(EncryptedReq<ProNeedInfo> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
PageInfo<ProNeedInfo> pageInfo = service.getDfhList(dto.getData());;
return pageInfo;
}
}

2
src/main/java/com/bonus/gzgqj/business/plan/entity/FileUploadVo.java
View File

@ -12,6 +12,8 @@ public class FileUploadVo {
* 文件名称
*/
private String fileName;
private String createName;
/**
* 文件路径
*/

7
src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java
View File

@ -132,4 +132,11 @@ public interface PlanOutMapper {
* @return
*/
List<ProNeedInfo> getOutDetailList(ProNeedInfo data);
/**
* 查询待发货数据
* @param data
* @return
*/
List<ProNeedInfo> getDfhList(ProNeedInfo data);
}

7
src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java
View File

@ -73,4 +73,11 @@ public interface PlanOutService {
* @return
*/
PageInfo<ProNeedInfo> getOutDetailList(ProNeedInfo data);
/**
*
* @param data
* @return
*/
PageInfo<ProNeedInfo> getDfhList(ProNeedInfo data);
}

24
src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java
View File

@ -50,6 +50,9 @@ public class PlanOutServiceImpl implements PlanOutService{
public PageInfo<ProPlanInfoVo> getProPlanPage(ProPlanInfoVo data) {
List<ProPlanInfoVo> list = new ArrayList<>();
try {
long userId= UserUtil.getLoginUser().getUserId();
String userName=UserUtil.getLoginUser().getUsername();
System.err.println("us===="+userId+"========="+userName);
list = mapper.getProPlanPage(data);
} catch (Exception e) {
log.error(e.toString(),e);
@ -108,6 +111,23 @@ public class PlanOutServiceImpl implements PlanOutService{
return pageInfo;
}
/**
* 待发货接口
* @param data
* @return
*/
@Override
public PageInfo<ProNeedInfo> getDfhList(ProNeedInfo data) {
List<ProNeedInfo> list = new ArrayList<>();
try {
list = mapper.getDfhList(data);
} catch (Exception e) {
log.error(e.toString(),e);
}
PageInfo<ProNeedInfo> pageInfo = new PageInfo<>(list);
return pageInfo;
}
/**
* 拆线呢 工程设备下拉选
@ -155,8 +175,8 @@ public class PlanOutServiceImpl implements PlanOutService{
return ServerResponse.createErroe("请填写出货数量");
}
List<ProAddInfoDetails> addList=vo.getAddList();
long userId= SecurityUtils.getUserId();
String userName=SecurityUtils.getUsername();
long userId= UserUtil.getLoginUser().getUserId();
String userName=UserUtil.getLoginUser().getUsername();
System.err.println("us===="+userId+"========="+userName);
//出库记录单存储
vo.setCreater(userId+"");

5
src/main/java/com/bonus/gzgqj/business/utils/FileUploadService.java
View File

@ -4,6 +4,7 @@ import com.bonus.gzgqj.business.plan.entity.FileUploadVo;
import com.bonus.gzgqj.business.plan.mapper.FileUploadMapper;
import com.bonus.gzgqj.manager.common.util.DateTimeHelper;
import com.bonus.gzgqj.manager.common.util.SecurityUtils;
import com.bonus.gzgqj.manager.common.util.UserUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -55,8 +56,10 @@ public class FileUploadService {
vo.setModelTable(table);
vo.setSuffix(suffix);
vo.setFileType(fileType);
String userId= SecurityUtils.getUserId()+"";
String userId= UserUtil.getLoginUser().getUserId()+"";
String userName=UserUtil.getLoginUser().getUsername();
vo.setCreator(userId);
vo.setCreateName(userName);
list.add(vo);
mapper.insertFileUpload(vo);
}

6
src/main/resources/mappers/plan/FileUploadMapper.xml
View File

@ -13,8 +13,8 @@
model_table,
own_id,
suffix,
file_type
)values(#{fileName},#{fileUrl},now(),#{creator},#{modelTable},#{ownId},#{suffix},#{fileType})
file_type,create_name
)values(#{fileName},#{fileUrl},now(),#{creator},#{modelTable},#{ownId},#{suffix},#{fileType},#{createName})
</insert>
<select id="getFileList" resultType="com.bonus.gzgqj.business.plan.entity.FileUploadVo">
@ -25,7 +25,7 @@
model_table,
own_id ownId ,
suffix,
file_type fileType
file_type fileType,create_name createName
from bm_file_upload
where own_id=#{ownId} and model_table=#{modelTable}

25
src/main/resources/mappers/plan/PlanOutMapper.xml
View File

@ -52,13 +52,11 @@
select pni.id,pni.pro_id proId,pni.type,pni.name,pni.module,pni.module_id,pni.need_type needType,
IFNULL(pni.unit,'-') unit ,IFNULL(pni.need_num,0) needNum ,(pni.fh_num+pni.tz_num )fhNum ,pro.`NAME` proName ,
IF(pni.need_num-pni.fh_num-pni.tz_num >0,pni.need_num-pni.fh_num-pni.tz_num,0) diff, IFNULL(ROUND((pni.fh_num+pni.tz_num)*100/pni.need_num,0),0) progress,
IF(pni.need_type=1,'计划内','计划外') typeName ,pni.tz_num tzNum,pni.remarks
IF(pni.need_type=1,'计划内','计划外') typeName ,pni.tz_num ,pni.remarks
from t_pro_need_info pni
LEFT JOIN bm_project pro on pni.pro_id=pro.id
<where>
<if test="dataType==null || dataType==''">
and pni.need_type=1
</if>
pni.need_type=1
<if test="proId!=null and proId!=''">
and pni.`pro_id` like concat('%',#{proId},'%')
</if>
@ -184,5 +182,24 @@
</if>
</where>
</select>
<select id="getDfhList" resultType="com.bonus.gzgqj.business.plan.entity.ProNeedInfo">
select pni.id,pni.pro_id proId,pni.type,pni.name,pni.module,pni.module_id,pni.need_type needType,
IFNULL(pni.unit,'-') unit ,IFNULL(pni.need_num,0) needNum ,(pni.fh_num+pni.tz_num )fhNum ,pro.`NAME` proName
,pni.tz_num ,pni.remarks
from t_pro_need_info pni
LEFT JOIN bm_project pro on pni.pro_id=pro.id
<where>
pni.need_type=1 and (pni.need_num-pni.fh_num-pni.tz_num)>0
<if test="proId!=null and proId!=''">
and pni.`pro_id` like concat('%',#{proId},'%')
</if>
<if test="module!=null and module!=''">
and pni.`module` like concat('%',#{module},'%')
</if>
<if test="name!=null and name!=''">
and pni.`name` like concat('%',#{name},'%')
</if>
</where>
</select>
</mapper>