From 58fe071b38d6c66596caf5169daf8847ae763738 Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Mon, 18 Dec 2023 13:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE=EF=BC=9B=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackApplyController.java | 12 ++++ .../sgzb/app/mapper/BackApplyMapper.java | 2 + .../sgzb/app/service/BackApplyService.java | 2 + .../service/impl/BackApplyServiceImpl.java | 5 ++ .../resources/mapper/app/BackApplyMapper.xml | 5 +- .../ReturnOfMaterialsInfoController.java | 37 +++++++++++ .../domain/ReturnOfMaterialsInfo.java | 64 +++++++++++++++++++ .../mapper/ReturnOfMaterialsInfoMapper.java | 17 +++++ .../service/ReturnOfMaterialsInfoService.java | 14 ++++ .../ReturnOfMaterialsInfoServiceImpl.java | 24 +++++++ .../material/ReturnOfMaterialsInfoMapper.xml | 29 +++++++++ 11 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 4c8584e7..8c7e2afe 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -10,12 +10,15 @@ import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.base.domain.WarehouseKeeper; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -272,4 +275,13 @@ public class BackApplyController extends BaseController { } } + + @ApiOperation("退料审核列表-审核") + @Log(title = "退料审核列表-审核", businessType = BusinessType.UPDATE) + @PostMapping("/audit") + public AjaxResult audit(String id) + { + return toAjax(backApplyService.audit(id)); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java index 369e5484..d9c0355c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java @@ -40,4 +40,6 @@ public interface BackApplyMapper { List examineList(BackApplyInfo record); List examineView(BackApplyInfo record); + + int audit(String id); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index d68fb2ec..5cbf9735 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -43,4 +43,6 @@ public interface BackApplyService { List examineList(BackApplyInfo record); List examineView(BackApplyInfo record); + + int audit(String id); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 8f6730d8..d9ed5357 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -81,4 +81,9 @@ public class BackApplyServiceImpl implements BackApplyService { return backApplyMapper.examineView(record); } + @Override + public int audit(String id) { + return backApplyMapper.audit(id); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index 39b0de21..f067c8a7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -268,7 +268,10 @@ NOW() ) - + + UPDATE tm_task SET task_status = 38 WHERE task_id = #{id} + + DELETE FROM back_apply_info WHERE id = #{id} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java new file mode 100644 index 00000000..7bf076dd --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java @@ -0,0 +1,37 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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; +import com.bonus.sgzb.material.domain.AgreementInfo; +import java.util.List; + +/** + * @author lsun + */ +@Api(tags = " 退料入库") +@RestController +@RequestMapping("/returnOfMaterialsInfo") +public class ReturnOfMaterialsInfoController extends BaseController { + @Autowired + private ReturnOfMaterialsInfoService returnOfMaterialsInfoService; + + /** + * 获取协议管理列表 + */ + @ApiOperation(value = "获取协议管理列表") + @GetMapping("/getReturnOfMaterialsInfoAll") + public TableDataInfo getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean) + { + startPage(); + List list = returnOfMaterialsInfoService.getReturnOfMaterialsInfoAll(bean); + return getDataTable(list); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java new file mode 100644 index 00000000..c33984b2 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java @@ -0,0 +1,64 @@ +package com.bonus.sgzb.material.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + * 退料入库 + */ +@Data +public class ReturnOfMaterialsInfo { + + + @ApiModelProperty(value = "id") + private Long id; + + /** 退料单号 */ + @ApiModelProperty(value = "退料单号") + private String code; + + /** 退料单位 */ + @ApiModelProperty(value = "退料单位") + private String unitName; + + /** 退料工程 */ + @ApiModelProperty(value = "退料工程") + private String lotName; + + + @ApiModelProperty(value = "机具id") + private Long kindId; + @ApiModelProperty(value = "机具名称") + private String kindName; + @ApiModelProperty(value = "类型id") + private Long typeId; + @ApiModelProperty(value = "类型ids") + private String typeIds; + @ApiModelProperty(value = "类型名称") + private String typeName; + @ApiModelProperty(value = "规格型号id") + private Long modelId; + @ApiModelProperty(value = "规格型号") + private String modelName; + + + @ApiModelProperty(value = "入库数量") + private String inputNum; + + @ApiModelProperty(value = "编号") + private String maCode; + + @ApiModelProperty(value = "退料时间") + private String returnTime; + + @ApiModelProperty(value = "提交入库时间") + private String submitStorageTime; + + @ApiModelProperty(value = "提交入库人员") + private String submitToStoragePersonnel; + + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java new file mode 100644 index 00000000..7d941cab --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java @@ -0,0 +1,17 @@ +package com.bonus.sgzb.material.mapper; + + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * @author lsun + */ +@Mapper +public interface ReturnOfMaterialsInfoMapper { + + List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java new file mode 100644 index 00000000..6912da12 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java @@ -0,0 +1,14 @@ +package com.bonus.sgzb.material.service; + + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; + +import java.util.List; + +/** + * @author lsun + */ +public interface ReturnOfMaterialsInfoService { + + List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java new file mode 100644 index 00000000..afe61f02 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java @@ -0,0 +1,24 @@ +package com.bonus.sgzb.material.service.impl; + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import com.bonus.sgzb.material.mapper.ReturnOfMaterialsInfoMapper; +import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author lsun + */ +@Service +public class ReturnOfMaterialsInfoServiceImpl implements ReturnOfMaterialsInfoService { + + @Autowired + private ReturnOfMaterialsInfoMapper returnOfMaterialsInfoMapper; + + @Override + public List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean) { + return returnOfMaterialsInfoMapper.getReturnOfMaterialsInfoAll(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml new file mode 100644 index 00000000..830f1d68 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file