|
@@ -136,6 +136,35 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
|
|
syCarry.setCkBy(loginUser.getUsername());//仓库提交人
|
|
syCarry.setCkBy(loginUser.getUsername());//仓库提交人
|
|
syCarry.setCkName(loginUser.getRealname());//仓库提交人
|
|
syCarry.setCkName(loginUser.getRealname());//仓库提交人
|
|
syCarry.setCkTime(new Date());//仓库提交时间
|
|
syCarry.setCkTime(new Date());//仓库提交时间
|
|
|
|
+ boolean ifAll = true;
|
|
|
|
+ List<SyCarryB> syCarryB2 = syCarryBMapper.selectByMainId(syCarry.getId());
|
|
|
|
+ for(SyCarryB o:syCarryB2){
|
|
|
|
+ if(StringUtils.isBlank(o.getJhyByData())){
|
|
|
|
+ sb.append("单据"+syCarry.getCode()+"计划员为空,请查看");
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ if(o.getJhyByData().contains("T0114")){//计划员为王行乔的,默认带出签名
|
|
|
|
+ o.setJhyBy("T0114");
|
|
|
|
+ o.setJhyName("王行乔");
|
|
|
|
+ o.setJhyTime(DateUtils.getDate("yyyy-MM-dd HH:mm:ss"));
|
|
|
|
+ syCarryBMapper.updateById(o);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isBlank(o.getJhyBy())){
|
|
|
|
+ ifAll = false;
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ String[] jhy = o.getJhyBy().split("/");
|
|
|
|
+ String[] jhyData = o.getJhyByData().split(",");
|
|
|
|
+ if(jhyData.length != jhy.length){
|
|
|
|
+ ifAll = false;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if(ifAll){
|
|
|
|
+ syCarry.setState("2");//0草稿,1仓库已提交(计划签字),2人事行政,3财务经理
|
|
|
|
+ }
|
|
|
|
+
|
|
syCarryMapper.updateById(syCarry);
|
|
syCarryMapper.updateById(syCarry);
|
|
sb.append("单据"+syCarry.getCode()+"提交成功");
|
|
sb.append("单据"+syCarry.getCode()+"提交成功");
|
|
continue;
|
|
continue;
|