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

Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

This commit is contained in:
zzyuan 2024-04-23 10:41:52 +08:00
parent a21e52816b 4408191900
commit 2a164bfcca
28 changed files with 237 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
View File

@ -272,6 +272,8 @@ public class SysLoginService {
public static String generateRandomPassword(int length) {
String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
Random random = new Random();
StringBuilder password = new StringBuilder();
for (int i = 0; i < length; i++) {

6
sgzb-auth/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 9200
port: 29200
# Spring
spring:
@ -14,11 +14,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml

6
sgzb-gateway/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 8080
port: 28080
# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
management:
@ -27,11 +27,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -140,6 +140,8 @@ public class BackReceiveController extends BaseController {
return AjaxResult.success("接收成功");
} else if (res == -1) {
return AjaxResult.error("该编码已接收");
} else if (res == -2) {
return AjaxResult.error("已超出退料数量！！");
} else {
return AjaxResult.error("接收失败");
}

1
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
View File

@ -165,6 +165,7 @@ public class BackApplyInfo {
private List<BackApplyInfo> backApplyDetails;
private Integer parentId;
private String sdStatus;
private String sdId;
/**
* 二维码编码
*/

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
View File

@ -160,7 +160,7 @@ public interface BackReceiveMapper {
* @param record
* @return List<BackApplyInfo>
*/
BackApplyInfo backReceiveRecord(BackApplyInfo record);
List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
/**
* 查询
@ -194,4 +194,8 @@ public interface BackReceiveMapper {
int deleteCheckDetails(BackApplyInfo backApplyInfo);
List<Integer> getMaId(BackApplyInfo backApplyInfo);
int selectNumByTypeId(@Param("parentId")Integer parentId,@Param("typeId") String typeId);
int selectTaskStatus(int taskId);
}

41
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -108,14 +108,20 @@ public class BackReceiveServiceImpl implements BackReceiveService {
BackApplyInfo[] arr = record.getArr();
if (arr.length > 0) {
for (int i = 0; i < arr.length; i++) {
//判断是否超出审核数量
int re = backReceiveMapper.selectNumByTypeId(arr[i].getParentId(), arr[i].getTypeId());
if (re <= 0) {
res = -2;
break;
}
//根据maId和taskId查询是否已接收
int re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
re = backReceiveMapper.selectCodeByMaIdAndTaskId(arr[i].getMaId(), record.getTaskId());
if (re > 0) {
res = -1;
break;
}
}
if (res == -1) {
if (res < 0) {
return res;
}
}
@ -123,7 +129,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
//修改任务状态
res = updateTaskStatus(taskId, 39);
if (res == 0) {
throw new RuntimeException("插入back_check_details异常");
throw new RuntimeException("修改updateTaskStatus异常");
}
//插入back_check_details
res = insertBcd(record);
@ -142,6 +148,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
int res;
try {
int taskId = record.getTaskId();
//先判断是否已经完成退料了
int taskStatus = selectTaskStatus(taskId);
if (taskStatus == 0) {
throw new RuntimeException("该退料单已完成退料");
}
//修改任务状态
res = updateTaskStatus(taskId, 40);
if (res == 0) {
@ -191,7 +202,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
if (allList != null && allList.size() > 0) {
res = updateSlt(record, allList);
if (res == 0) {
throw new RuntimeException("slt_agreement_info");
throw new RuntimeException("该机具未被领料使用");
}
}
} catch (Exception e) {
@ -200,6 +211,15 @@ public class BackReceiveServiceImpl implements BackReceiveService {
return res;
}
private int selectTaskStatus(int taskId) {
int taskStatus = backReceiveMapper.selectTaskStatus(taskId);
if (taskStatus == 40) {
return 0;
} else {
return 1;
}
}
private int updateSlt(BackApplyInfo record, List<BackApplyInfo> hgList) {
for (BackApplyInfo bean : hgList) {
List<SltAgreementInfo> infoList = backReceiveMapper.getStlInfo(bean);
@ -239,16 +259,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
@Override
public List<BackApplyInfo> backReceiveRecord(BackApplyInfo record) {
String typeId = record.getTypeId();
String[] split = typeId.split(",");
List<BackApplyInfo> backApplyInfoList = new ArrayList<>();
for (String s : split) {
record.setTypeId(s);
BackApplyInfo backApplyInfo = backReceiveMapper.backReceiveRecord(record);
if (backApplyInfo != null) {
backApplyInfoList.add(backApplyInfo);
}
}
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.backReceiveRecord(record);
return backApplyInfoList;
}

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -92,13 +92,17 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (CollUtil.isEmpty(maMachineByMaIdAndMaCode)) {
maMachine.setCreateTime(new Date());
int i = maMachineMapper.maMachineAdd(maMachine);
String labelCode = maMachine.getQrCode();
MaLabelBind maLabelBinds = maLabelBindMapper.selectMaLabelBindByMaCode(maMachine);
if (maLabelBinds != null) {
MaLabelBindVO maLabelBind = new MaLabelBindVO();
maLabelBind.setTypeId(maMachine.getTypeId());
maLabelBind.setBindTime(new Date().toString());
maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername());
maLabelBindMapper.updateMaLabelBind(maLabelBind);
return 0;
} else {
MaLabelBind maLabelBind = new MaLabelBind();
@ -106,10 +110,13 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
maLabelBind.setMaId(maMachine.getMaId());
maLabelBind.setTypeId(maMachine.getTypeId());
maLabelBind.setBindTime(new Date());
maLabelBind.setBinder(SecurityUtils.getLoginUser().getUsername());
maLabelBind.setStatus("1");
maLabelBind.setLabelType(9);
maLabelBindMapper.insertLabelBind(maLabelBind);
maLabelBindMapper.updateMalableCode(maLabelBind);
maLabelBindMapper.updateMatypeNum(maLabelBind);
return 0;
}
} else {
@ -185,7 +192,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
return AjaxResult.error("您已提交，请勿重复点击");
}
} catch (Exception e) {
log.error(e.getMessage());
e.printStackTrace();
return AjaxResult.error("出库失败");
}
return AjaxResult.success("出库成功");

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -1055,7 +1055,7 @@ public class TmTaskServiceImpl implements TmTaskService {
}
} catch (Exception e) {
log.error(e.getMessage(), e);
e.printStackTrace();
}
return res;
}

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
View File

@ -90,4 +90,8 @@ public interface MaLabelBindMapper
int insertLabelBind(MaLabelBind maLabelBind);
MaLabelBind selectMaLabelBindByMaCode(MaMachine maMachine);
void updateMalableCode(MaLabelBind maLabelBind);
void updateMatypeNum(MaLabelBind maLabelBind);
}

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/WarehouseKeeperServiceImpl.java
View File

@ -50,8 +50,6 @@ public class WarehouseKeeperServiceImpl implements WarehouseKeeperService {
int i = 0;
if (list.size() > 0) {
i = warehouseKeeperMapper.add(list);
}else{
}
return i;
}

6
sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 9301
port: 29301
# Spring
spring:
@ -21,11 +21,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml

1
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
View File

@ -483,6 +483,7 @@
<select id="examineList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
bai.id,
bai.code,
bai.status,
bai.back_person as backPerson,
bai.phone,

42
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -648,7 +648,7 @@
bagi.plan_start_time
<if test="typeId != null and typeId != ''">
HAVING
FIND_IN_SET(#{typeId}, GROUP_CONCAT(DISTINCT mt2.type_id))
FIND_IN_SET(#{typeId}, GROUP_CONCAT(DISTINCT bad.type_id))
</if>
ORDER BY
tt.task_status ASC,
@ -667,7 +667,7 @@
mt2.type_name AS typeName,
bad.pre_num as preNum,
bad.status as status,
IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as partNum,
IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
mt.manage_type as manageType,
CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
FROM
@ -696,12 +696,8 @@
</if>
</select>
<select id="selectTaskNumByMonthWx" resultType="java.lang.String">
SELECT SUBSTRING(`code`, - 4) as code
FROM tm_task
WHERE DATE_FORMAT(create_time, '%y%m') = DATE_FORMAT(#{date}, '%y%m')
AND task_type = #{taskType}
ORDER BY create_time DESC LIMIT 1
<select id="selectTaskNumByMonthWx" resultType="java.lang.Integer">
select count(*) from tm_task where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m') and task_type = #{taskType}
</select>
<select id="getHgList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
@ -935,6 +931,32 @@
<select id="getMaId" resultType="java.lang.Integer">
select ma_id from back_check_details where parent_id = #{parentId} and type_id = #{typeId}
</select>
<select id="selectTaskStatus" resultType="java.lang.Integer">
select task_status from tm_task where task_id = #{taskId}
</select>
<select id="selectNumByTypeId" resultType="java.lang.Integer">
SELECT
ROUND(SUM( res.auditNum )- SUM( res.backNum ),0) AS backNum
FROM
(
SELECT
bad.audit_num AS auditNum,
0 AS backNum
FROM
back_apply_details bad
WHERE
bad.parent_id = #{parentId}
AND bad.type_id = #{typeId} UNION
SELECT
0 AS auditNum,
SUM(
IFNULL( bcd.back_num, 0 )) AS backNum
FROM
back_check_details bcd
WHERE
bcd.parent_id = #{parentId}
AND bcd.type_id = #{typeId}
) res
HAVING backNum > -1
</select>
</mapper>

26
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -16,6 +16,32 @@
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap>
<resultMap id="ResultMap" type="com.bonus.sgzb.app.domain.TmTask">
<!--@Table tm_task-->
<id column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="task_type" jdbcType="INTEGER" property="taskType" />
<result column="task_status" jdbcType="INTEGER" property="taskStatus" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<collection property="leaseApplyDetails" ofType="com.bonus.sgzb.app.domain.TmTask">
<id column="dId" property="id" jdbcType="INTEGER" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</collection>
</resultMap>
<sql id="Base_Column_List">
task_id, task_type, task_status, code, create_by, create_time, update_by, update_time,
remark, company_id

10
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
View File

@ -194,6 +194,16 @@
ma_id = #{maId},is_bind =#{isBind}
where label_id =#{labelId}
</update>
<update id="updateMalableCode" parameterType="com.bonus.sgzb.base.api.domain.MaLabelBind">
update ma_machine_label set
ma_id = #{maId},is_bind =1
where label_code =#{labelCode}
</update>
<update id="updateMatypeNum" parameterType="com.bonus.sgzb.base.api.domain.MaLabelBind">
update ma_type set
num = num + 1
where type_id =#{typeId}
</update>
<insert id="insertMaLabels">
insert into ma_maLabel
<trim prefix="(" suffix=")" suffixOverrides=",">

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/SgzbMaterialApplication.java
View File

@ -22,7 +22,7 @@ public class SgzbMaterialApplication
public static void main(String[] args)
{
SpringApplication.run(SgzbMaterialApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 基础管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
System.out.println("(♥◠‿◠)ﾉﾞ 机具管理模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +

36
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.MachinePart;
import com.bonus.sgzb.material.domain.PurchaseInput;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
@ -30,8 +31,7 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
@RestController
@Api(value = "新购验收任务")
@RequestMapping("/purchaseCheckInfo")
public class PurchaseCheckInfoController extends BaseController
{
public class PurchaseCheckInfoController extends BaseController {
@Autowired
private IPurchaseCheckInfoService purchaseCheckInfoService;
@ -59,13 +59,23 @@ public class PurchaseCheckInfoController extends BaseController
return getDataTable(list);
}
/**
* 成套机具明细查看
*/
@ApiOperation("成套机具明细查看")
@GetMapping("/wholeSetDetails")
public TableDataInfo wholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) {
startPage();
List<MachinePart> list = purchaseCheckInfoService.getWholeSetDetails(purchaseCheckInfo);
return getDataTable(list);
}
/**
* 查询新购验收任务列表
*/
@ApiOperation("查询新购验收任务列表")
@GetMapping("/list")
public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo)
{
public TableDataInfo list(PurchaseCheckInfo purchaseCheckInfo) {
startPage();
List<PurchaseCheckInfo> list = purchaseCheckInfoService.selectPurchaseCheckInfoList(purchaseCheckInfo);
return getDataTable(list);
@ -77,8 +87,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("导出新购验收任务列表")
@Log(title = "新购验收任务", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo)
{
public void export(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseCheckInfo> list = purchaseCheckInfoService.exportList(purchaseCheckInfo);
ExcelUtil<PurchaseCheckInfo> util = new ExcelUtil<PurchaseCheckInfo>(PurchaseCheckInfo.class);
util.exportExcel(response, list, "新购验收任务数据");
@ -90,8 +99,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("导出新购工机具入库")
@Log(title = "导出新购工机具入库", businessType = BusinessType.EXPORT)
@PostMapping("/putInExport")
public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo)
{
public void putInExport(HttpServletResponse response, PurchaseCheckInfo purchaseCheckInfo) {
List<PurchaseInput> list = purchaseCheckInfoService.putInExportList(purchaseCheckInfo);
ExcelUtil<PurchaseInput> util = new ExcelUtil<PurchaseInput>(PurchaseInput.class);
util.exportExcel(response, list, "新购工机具入库");
@ -103,8 +111,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("获取新购验收任务详细信息")
@GetMapping(value = "/getDetails")
public AjaxResult getInfo(@RequestParam(required = false) Long taskId,
@RequestParam(required = false) String keyWord)
{
@RequestParam(required = false) String keyWord) {
return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId, keyWord));
}
@ -114,8 +121,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("获取新购验收任务验收单")
@GetMapping(value = "/getAcceptanceForm")
public AjaxResult getAcceptanceForm(@RequestParam(required = false) Long taskId,
@RequestParam(required = false) String keyWord)
{
@RequestParam(required = false) String keyWord) {
return success(purchaseCheckInfoService.getAcceptanceForm(taskId, keyWord));
}
@ -125,8 +131,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("新增新购验收任务")
@Log(title = "新购验收任务", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PurchaseCheckInfo purchaseCheckInfo)
{
public AjaxResult add(@RequestBody PurchaseCheckInfo purchaseCheckInfo) {
return toAjax(purchaseCheckInfoService.insertPurchaseCheckInfo(purchaseCheckInfo));
}
@ -155,8 +160,7 @@ public class PurchaseCheckInfoController extends BaseController
@ApiOperation("删除新购验收任务")
@Log(title = "新购验收任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskId}")
public AjaxResult remove(@PathVariable Long taskId)
{
public AjaxResult remove(@PathVariable Long taskId) {
return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId));
}
}

17
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.material.domain.BmNoticeInfo;
import com.bonus.sgzb.material.domain.MachinePart;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.domain.PurchaseInput;
import org.apache.ibatis.annotations.Mapper;
@ -15,8 +16,7 @@ import java.util.List;
* @date 2023-12-10
*/
@Mapper
public interface PurchaseCheckInfoMapper
{
public interface PurchaseCheckInfoMapper {
/**
* 查询新购验收任务purchase_check_info
*
@ -67,14 +67,15 @@ public interface PurchaseCheckInfoMapper
/**
* 查询新购入库任务列表
* @param taskId
** @param type 1-验收，2-入库
*
* @param taskId * @param type 1-验收，2-入库
* @return
*/
String selectTypeNameByTaskId(@Param("taskId") Long taskId, @Param("type") String type);
/**
* 插入
*
* @param bmNoticeInfo
* @return
*/
@ -82,6 +83,7 @@ public interface PurchaseCheckInfoMapper
/**
* 查询
*
* @param purchaseCheckInfo
* @return
*/
@ -89,12 +91,15 @@ public interface PurchaseCheckInfoMapper
/**
* 新购验收
*
* @param purchaseCheckInfo
* @return
*/
List<PurchaseCheckInfo> exportList(PurchaseCheckInfo purchaseCheckInfo);
/**
* 新购入库导出
*
* @param purchaseCheckInfo
* @return
*/
@ -102,6 +107,7 @@ public interface PurchaseCheckInfoMapper
/**
* 查询
*
* @param purchaseCheckInfo
* @return
*/
@ -109,8 +115,11 @@ public interface PurchaseCheckInfoMapper
/**
* 查询 类型名称和管理类型
*
* @param taskId
* @return
*/
List<PurchaseCheckInfo> selectTypeNameAndManageTypeByTaskId(Long taskId);
List<MachinePart> getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo);
}

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.BmNoticeInfo;
import com.bonus.sgzb.material.domain.MachinePart;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.domain.PurchaseInput;
import com.bonus.sgzb.material.vo.NoticeInfoVO;
@ -107,4 +108,6 @@ public interface IPurchaseCheckInfoService
* @return
*/
List<PurchaseCheckInfo> selectPutInListExamine(PurchaseCheckInfo purchaseCheckInfo);
List<MachinePart> getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo);
}

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -205,6 +205,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} else {
return AjaxResult.error("未获取到参数");
}
return AjaxResult.success("修改成功");
}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -107,6 +107,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
return purchaseCheckInfos;
}
@Override
public List<MachinePart> getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo) {
return purchaseCheckInfoMapper.getWholeSetDetails(purchaseCheckInfo);
}
/**
* 查询新购验收任务列表
*
@ -168,7 +173,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
return purchaseCheckInfoMapper.insertPurchaseCheckInfo(purchaseCheckInfo);
}
/**采购单号编码生成规则*/
/**
* 采购单号编码生成规则
*/
private String purchaseCodeRule() {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date nowDate = DateUtils.getNowDate();

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -4,12 +4,14 @@ import com.bonus.sgzb.base.api.domain.SltAgreementApply;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.base.api.domain.SltAgreementRelation;
import com.bonus.sgzb.base.api.domain.SltInfoVo;
import com.bonus.sgzb.common.core.exception.ServiceException;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.AgreementInfo;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.mapper.SltAgreementInfoMapper;
import com.bonus.sgzb.material.service.SltAgreementInfoService;
import com.bonus.sgzb.material.vo.GlobalContants;

6
sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 9302
port: 29302
# Spring
spring:
@ -21,11 +21,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml

24
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -309,4 +309,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) t
GROUP BY task_id
</select>
<select id="getWholeSetDetails" resultType="com.bonus.sgzb.material.domain.MachinePart">
SELECT
mt2.type_name AS typeModelName,
mt3.type_name AS typeName,
aa.part_num * #{purchaseNum} AS partNum,
mt2.unit_name as unitName
FROM
ma_type mt2
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
INNER JOIN (
SELECT
mws.type_id,
mws.part_num
FROM
ma_type mt
LEFT JOIN ma_whole_set mws ON mt.type_id = mws.parent_id
WHERE
mt.type_id = #{typeId}
) aa ON aa.type_id = mt2.type_id
<if test="keyWord != null and keyWord != ''">
WHERE mt2.type_name like concat('%', #{keyWord}, '%')
</if>
</select>
</mapper>

6
sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 9201
port: 29201
# Spring
spring:
@ -25,11 +25,11 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
config:
# 配置中心地址
server-addr: 192.168.0.14:8848
server-addr: 127.0.0.1:8848
namespace: sgzb_cloud_dev
# 配置文件格式
file-extension: yml

143
sgzb-ui/src/views/claimAndRefund/return/apply.json
View File

@ -1,143 +0,0 @@
/** 退料ID */
@ApiModelProperty(value = "退料ID")
private Long id;
/** 退料ID-字符串 */
@ApiModelProperty(value = "退料ID-字符串")
private String ids;
/** 退料单号 */
@Excel(name = "退料单号")
@ApiModelProperty(value = "退料单号")
private String code;
/** 任务ID */
@ApiModelProperty(value = "任务ID")
private Integer taskId;
/** 任务ID */
@ApiModelProperty(value = "任务类型")
private Integer taskType;
/** 签订日期 */
@ApiModelProperty(value = "签订日期")
private String signTime;
/** 退料人员 */
@Excel(name = "退料人员")
@ApiModelProperty(value = "退料人员")
private String backPerson;
/** 联系电话 */
@Excel(name = "退料人联系电话")
@ApiModelProperty(value = "联系电话")
private String phone;
/** 机具公司审核人 */
@ApiModelProperty(value = "机具公司审核人")
private Integer directAuditBy;
/** 机具公司审批时间 */
@ApiModelProperty(value = "机具公司审批时间")
private String directAuditTime;
/** 机具公司审批备注 */
@ApiModelProperty(value = "机具公司审批备注")
private String directAuditRemark;
/** 创建者 */
@ApiModelProperty(value = "创建者")
private String createBy;
/** 创建时间 */
@ApiModelProperty(value = "创建时间")
private Date createTime;
/** 更新者 */
@ApiModelProperty(value = "更新者")
private String updateBy;
/** 更新时间 */
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/** 备注 */
@ApiModelProperty(value = "备注")
private String remark;
/** 数据所属组织 */
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
@ApiModelProperty(value = "关键字")
private String keyWord;
@ApiModelProperty(value = "工程id")
private Integer lotId;
@Excel(name = "退料工程名称")
@ApiModelProperty(value = "工程名称")
private String lotName;
@ApiModelProperty(value = "单位id")
private Integer unitId;
@Excel(name = "退料单位名称")
@ApiModelProperty(value = "单位名称")
private String unitName;
@Excel(name = "退料申请时间")
@ApiModelProperty(value = "退料日期")
private String backTime;
@Excel(name = "协议号")
@ApiModelProperty(value = "协议编号")
private String agreementCode;
@Excel(name = "退料状态")
@ApiModelProperty(value = "任务状态")
private String taskStatus;
@ApiModelProperty(value = "协议id")
private Integer agreementId;
@ApiModelProperty(value = "类型id")
private String typeId;
@Excel(name = "退料工机具类型")
@ApiModelProperty(value = "类型名称")
private String typeName;
@ApiModelProperty(value = "规格编号")
private String typeCode;
@ApiModelProperty(value = "数量")
private String num;
@ApiModelProperty(value = "详情id和数量")
private String detailsIdByNum;
@ApiModelProperty(value = "类型id和数量")
private String typeIdByNum;
@ApiModelProperty(value = "详情id")
private String detailsId;
@ApiModelProperty(value = "编码")
private String maCode;
@ApiModelProperty(value = "在用数量")
private String useNum;
@ApiModelProperty(value = "操作人")
private String createName;
@ApiModelProperty(value = "审核人")
private String examineName;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;

1
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

@ -885,4 +885,3 @@ export default {
cursor: pointer;
}
</style>