Compare commits
No commits in common. "4a57f9a3bcbd9601f866817ece58cc9523a0d0ac" and "2d3039838517556be93f5db767e6a16704b075dd" have entirely different histories.
4a57f9a3bc
...
2d30398385
|
|
@ -220,7 +220,6 @@ public class AppBackApplyController extends BaseController {
|
||||||
}
|
}
|
||||||
for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) {
|
for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) {
|
||||||
backApplyInfo.setParentId(record.getParentId());
|
backApplyInfo.setParentId(record.getParentId());
|
||||||
backApplyService.updateBackInfo(record.getParentId(),record.getCompanyId());
|
|
||||||
boolean re = backApplyService.upload(backApplyInfo) > 0;
|
boolean re = backApplyService.upload(backApplyInfo) > 0;
|
||||||
if (!re) {
|
if (!re) {
|
||||||
return AjaxResult.error("退料任务明细插入失败");
|
return AjaxResult.error("退料任务明细插入失败");
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import com.bonus.sgzb.app.domain.TmTask;
|
||||||
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
|
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
|
||||||
import com.bonus.sgzb.base.api.domain.MachinePart;
|
import com.bonus.sgzb.base.api.domain.MachinePart;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -58,6 +57,4 @@ public interface AppBackApplyAppMapper {
|
||||||
List<TmTask> getMaTypeDetails(BackApplyInfo backApplyInfo);
|
List<TmTask> getMaTypeDetails(BackApplyInfo backApplyInfo);
|
||||||
|
|
||||||
MachinePart getMachineParts(TmTask typeId);
|
MachinePart getMachineParts(TmTask typeId);
|
||||||
|
|
||||||
void updateBackInfo(@Param("parentId") Integer parentId, @Param("companyId") String companyId);
|
|
||||||
}
|
}
|
||||||
|
|
@ -112,6 +112,4 @@ public interface AppBackApplyService {
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
int refuse(BackApplyInfo record);
|
int refuse(BackApplyInfo record);
|
||||||
|
|
||||||
void updateBackInfo(Integer parentId, String companyId);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -203,9 +203,4 @@ public class AppBackApplyServiceImpl implements AppBackApplyService {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBackInfo(Integer parentId, String companyId) {
|
|
||||||
appBackApplyMapper.updateBackInfo(parentId,companyId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -337,9 +337,6 @@
|
||||||
WHERE
|
WHERE
|
||||||
bai.id = #{id}
|
bai.id = #{id}
|
||||||
</update>
|
</update>
|
||||||
<update id="updateBackInfo">
|
|
||||||
update back_apply_info set company_id = #{companyId} where id = #{parentId}
|
|
||||||
</update>
|
|
||||||
|
|
||||||
<delete id="del">
|
<delete id="del">
|
||||||
DELETE
|
DELETE
|
||||||
|
|
|
||||||
|
|
@ -447,7 +447,6 @@
|
||||||
<if test="level == 0">
|
<if test="level == 0">
|
||||||
and mt.level = 4
|
and mt.level = 4
|
||||||
</if>
|
</if>
|
||||||
and mt2.type_id is not null
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateTypeNum">
|
<update id="updateTypeNum">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue