Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
This commit is contained in:
zhouzy062
commit
5b8a94b6d6
|
|
@ -291,7 +291,7 @@
|
|||
WHERE
|
||||
bai.id = #{id}
|
||||
</update>
|
||||
<update id="examineListByUser">
|
||||
<select id="examineListByUser">
|
||||
SELECT
|
||||
bai.id,
|
||||
bai.status,
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
bad.type_id is not null and tt.create_by = #{createBy}
|
||||
GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
|
||||
ORDER BY bai.create_time desc
|
||||
</update>
|
||||
</select>
|
||||
<update id="updateBackApply">
|
||||
UPDATE tm_task tt
|
||||
LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
|
||||
|
|
|
|||
|
|
@ -113,8 +113,8 @@ public class WorkSiteDirectManageController extends BaseController {
|
|||
@PostMapping("/pass")
|
||||
public AjaxResult pass(@RequestBody DirectPassApplyInfoDetails directApplyInfoDetails) {
|
||||
// 修改direct_apply_info 状态
|
||||
if (StringUtils.isNotBlank(directApplyInfoDetails.getDirectApplyInfoId())) {
|
||||
DirectApplyInfo directApplyInfos = workSiteDirectManageService.getDirectApplyInfoById(directApplyInfoDetails.getDirectApplyInfoId());
|
||||
if (StringUtils.isNotBlank(directApplyInfoDetails.getId())) {
|
||||
DirectApplyInfo directApplyInfos = workSiteDirectManageService.getDirectApplyInfoById(directApplyInfoDetails.getId());
|
||||
directApplyInfos.setStatus("1");
|
||||
workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfos);
|
||||
} else {
|
||||
|
|
@ -150,8 +150,8 @@ public class WorkSiteDirectManageController extends BaseController {
|
|||
return AjaxResult.error("领料信息和详情新增失败");
|
||||
}
|
||||
|
||||
LeaseOutDetails leaseOutDetails = directApplyInfoDetails.getLeaseOutDetails();
|
||||
if (leaseOutDetails == null) {
|
||||
List<LeaseOutDetails> leaseOutDetails = directApplyInfoDetails.getLeaseOutDetails();
|
||||
if (CollUtil.isEmpty(leaseOutDetails)) {
|
||||
return AjaxResult.error("领料出库信息为空");
|
||||
}
|
||||
// 新增出库记录
|
||||
|
|
@ -159,10 +159,10 @@ public class WorkSiteDirectManageController extends BaseController {
|
|||
if (res4 == 0) {
|
||||
return AjaxResult.error("新增出库记录失败");
|
||||
}
|
||||
|
||||
//-----------------------------------------------分割线--------------------------------------------------------
|
||||
//创建退料任务
|
||||
BackApplyInfo backApplyInfo = directApplyInfoDetails.getBackApplyInfo();
|
||||
if (backApplyInfo == null){
|
||||
if (backApplyInfo == null) {
|
||||
return AjaxResult.error("退料任务参数为空");
|
||||
}
|
||||
// 生成退料code
|
||||
|
|
@ -187,7 +187,10 @@ public class WorkSiteDirectManageController extends BaseController {
|
|||
return AjaxResult.error("退料信息和详情新增失败");
|
||||
}
|
||||
|
||||
workSiteDirectManageService.insertBackCheckDetails(backApplyInfo);
|
||||
int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyInfo);
|
||||
if (res8 == 0) {
|
||||
return AjaxResult.error("新增入库记录失败");
|
||||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
|
@ -208,5 +211,11 @@ public class WorkSiteDirectManageController extends BaseController {
|
|||
}
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查看详情")
|
||||
@GetMapping("/getInfo")
|
||||
public AjaxResult refuse(String id) {
|
||||
return AjaxResult.success(workSiteDirectManageService.getInfoById(id));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ import java.util.List;
|
|||
public class DirectPassApplyInfoDetails extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String directApplyInfoId;
|
||||
private String id;
|
||||
|
||||
private TmTask task;
|
||||
|
||||
private BackApplyInfo backApplyInfo;
|
||||
|
||||
private LeaseOutDetails leaseOutDetails;
|
||||
private List<LeaseOutDetails> leaseOutDetails;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public interface WorkSiteDirectManageMapper {
|
|||
|
||||
List<DirectApplyInfo> getList();
|
||||
|
||||
DirectApplyInfo getDirectApplyInfoById(String directApplyInfoDetails);
|
||||
DirectApplyInfo getDirectApplyInfoById(String id);
|
||||
|
||||
int insertSelective(LeaseApplyInfo leaseApplyInfo);
|
||||
|
||||
|
|
@ -56,4 +56,6 @@ public interface WorkSiteDirectManageMapper {
|
|||
int updateMaMachineStatus(@Param("record")LeaseOutDetails leaseOutDetails);
|
||||
|
||||
int insertBackApplyInfo(TmTask task);
|
||||
|
||||
DirectApplyInfo getInfoById(String id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public interface WorkSiteDirectManageService {
|
|||
|
||||
String genderLeaseCode();
|
||||
|
||||
DirectApplyInfo getDirectApplyInfoById(String directApplyInfoDetails);
|
||||
DirectApplyInfo getDirectApplyInfoById(String id);
|
||||
|
||||
int insertTmTask(TmTask bean);
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ public interface WorkSiteDirectManageService {
|
|||
|
||||
int insertApplyInfoAndDetails(TmTask task);
|
||||
|
||||
int insertLeaseOutDetail(LeaseOutDetails leaseOutDetails);
|
||||
int insertLeaseOutDetail(List<LeaseOutDetails> leaseOutDetails);
|
||||
|
||||
int insertBackApplyInfoAndDetails(BackApplyInfo backApplyInfo);
|
||||
|
||||
|
|
@ -40,4 +40,6 @@ public interface WorkSiteDirectManageService {
|
|||
int insertAgreementByBackInfo(BackApplyInfo backApplyInfo);
|
||||
|
||||
int insertBackCheckDetails(BackApplyInfo backApplyInfo);
|
||||
|
||||
DirectApplyInfo getInfoById(String id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ import com.bonus.sgzb.material.domain.TmTask;
|
|||
import com.bonus.sgzb.material.mapper.BackRecordMapper;
|
||||
import com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper;
|
||||
import com.bonus.sgzb.material.service.BackApplyService;
|
||||
import com.bonus.sgzb.material.service.LeaseRecordService;
|
||||
import com.bonus.sgzb.material.service.TaskService;
|
||||
import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -48,7 +49,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
private BackApplyService backApplyService;
|
||||
|
||||
@Autowired
|
||||
private BackRecordMapper backRecordMapper;
|
||||
private BackRecordMapper backRecordMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public List<SltAgreementInfo> getUseringData(String agreementId) {
|
||||
|
|
@ -89,8 +91,8 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public DirectApplyInfo getDirectApplyInfoById(String directApplyInfoDetails) {
|
||||
return workSiteDirectManageMapper.getDirectApplyInfoById(directApplyInfoDetails);
|
||||
public DirectApplyInfo getDirectApplyInfoById(String id) {
|
||||
return workSiteDirectManageMapper.getDirectApplyInfoById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -184,7 +186,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int insertLeaseOutDetail(LeaseOutDetails leaseOutDetails) {
|
||||
public int insertLeaseOutDetail(List<LeaseOutDetails> leaseOutDetails) {
|
||||
int res = 0;
|
||||
String maStatus = "15";
|
||||
double outNum = 0.1;
|
||||
|
|
@ -192,33 +194,29 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
log.info("领料出库失败,请检查参数是否填写完整!");
|
||||
return res;
|
||||
}
|
||||
if (!(Objects.equals(Integer.valueOf(0), leaseOutDetails.getMaId()) || leaseOutDetails.getMaId() == null)) {
|
||||
String status = workSiteDirectManageMapper.getMachineStatus(leaseOutDetails);
|
||||
if (!maStatus.equals(status)) {
|
||||
log.info("领料出库失败,该设备不是在库状态！");
|
||||
for (LeaseOutDetails leaseOutDetail : leaseOutDetails) {
|
||||
if (!(Objects.equals(Integer.valueOf(0), leaseOutDetail.getMaId()) || leaseOutDetail.getMaId() == null)) {
|
||||
String status = workSiteDirectManageMapper.getMachineStatus(leaseOutDetail);
|
||||
if (!maStatus.equals(status)) {
|
||||
log.info("领料出库失败,该设备不是在库状态！");
|
||||
return res;
|
||||
}
|
||||
}
|
||||
// 首先更新领料任务详情表的领料数及状态
|
||||
int updateLeaseApplyDetailsOutNum = workSiteDirectManageMapper.updateLeaseApplyDetailsOutNum(leaseOutDetail);
|
||||
if (updateLeaseApplyDetailsOutNum < 1) {
|
||||
return res;
|
||||
}
|
||||
// 插入领料出库明细表
|
||||
int insertSelectiveNum = workSiteDirectManageMapper.insertLeaseOutDetails(leaseOutDetail);
|
||||
if (insertSelectiveNum < 1) {
|
||||
return res;
|
||||
}
|
||||
// 更新 (ma_machine 设备表)的状态
|
||||
int updateMaMachineNum = workSiteDirectManageMapper.updateMaMachineStatus(leaseOutDetail);
|
||||
if (updateMaMachineNum < 1) {
|
||||
return res;
|
||||
}
|
||||
}
|
||||
// 首先更新领料任务详情表的领料数及状态
|
||||
leaseOutDetails.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
|
||||
/* int updateLeaseApplyDetailsOutNum = workSiteDirectManageMapper.updateLeaseApplyDetailsOutNum(leaseOutDetails);
|
||||
if (updateLeaseApplyDetailsOutNum < 1) {
|
||||
return res;
|
||||
}*/
|
||||
// 插入领料出库明细表
|
||||
int insertSelectiveNum = workSiteDirectManageMapper.insertLeaseOutDetails(leaseOutDetails);
|
||||
if (insertSelectiveNum < 1) {
|
||||
return res;
|
||||
}
|
||||
// 减少 (ma_type 设备规格表)的库存数量
|
||||
int updateMaTypeStockNum = workSiteDirectManageMapper.updateMaTypeStockNum(leaseOutDetails);
|
||||
if (updateMaTypeStockNum < 1) {
|
||||
return res;
|
||||
}
|
||||
// 更新 (ma_machine 设备表)的状态
|
||||
int updateMaMachineNum = workSiteDirectManageMapper.updateMaMachineStatus(leaseOutDetails);
|
||||
if (updateMaMachineNum < 1) {
|
||||
return res;
|
||||
}
|
||||
res = 1;
|
||||
return res;
|
||||
|
|
@ -327,23 +325,25 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
|
|||
@Override
|
||||
public int insertBackCheckDetails(BackApplyInfo backApplyInfo) {
|
||||
//插入back_check_details
|
||||
return this.insertBcd(backApplyInfo);
|
||||
return insertBcd(backApplyInfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DirectApplyInfo getInfoById(String id) {
|
||||
return workSiteDirectManageMapper.getInfoById(id);
|
||||
}
|
||||
|
||||
public int insertBcd(BackApplyInfo backApplyInfo) {
|
||||
int res =0;
|
||||
int res = 0;
|
||||
BackApplyInfo[] arr = backApplyInfo.getArr();
|
||||
if(arr.length>0){
|
||||
for(int i=0 ; i< arr.length;i++){
|
||||
res = backRecordMapper.insertCheckDetails(arr[i]);
|
||||
String backStatus = arr[i].getBackStatus();
|
||||
int maId = arr[i].getMaId();
|
||||
//退料合格状态变为退料带入库84
|
||||
backRecordMapper.updateMaStatus(maId,"84");
|
||||
if (arr.length > 0) {
|
||||
for (int i = 0; i < arr.length; i++) {
|
||||
res = backRecordMapper.insertCheckDetails(arr[i]);
|
||||
int maId = arr[i].getMaId();
|
||||
//退料完成状态改成在库
|
||||
backRecordMapper.updateMaStatus(maId, "15");
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -409,4 +409,37 @@
|
|||
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
|
||||
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
|
||||
</select>
|
||||
<select id="getInfoById" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
|
||||
SELECT
|
||||
dai.*,
|
||||
dad.direct_num AS directNum,
|
||||
bpl.lot_id AS backProId,
|
||||
mt3.type_name AS typeName,
|
||||
mt2.type_name AS kindName,
|
||||
mt.type_name AS modelName,
|
||||
mt.unit_name AS unitName,
|
||||
mm.ma_code AS maCode,
|
||||
bpl.lot_name AS backProName,
|
||||
bui.unit_id AS backUnitId,
|
||||
bui.unit_name AS backUnitName,
|
||||
bpl1.lot_id AS leaseProId,
|
||||
bpl1.lot_name AS leaseProName,
|
||||
bui1.unit_id AS leaseUnitId,
|
||||
bui1.unit_name AS leaseUnitName
|
||||
FROM
|
||||
direct_apply_info dai
|
||||
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
|
||||
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
|
||||
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
|
||||
LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id
|
||||
LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id
|
||||
LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id
|
||||
LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id
|
||||
LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id
|
||||
LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id
|
||||
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
|
||||
LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id
|
||||
WHERE
|
||||
dai.id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue