yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合同导入加判断、去掉基础数据的删除、磅单编辑加条件

Browse Source
product
bawei 1 year ago
parent 93e72d417c
commit b47bce7552
6 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File

3
SC-boot/linkage-scm/src/main/java/jnpf/contractfile/controller/ContractFileController.java
Unescape View File

@ -288,6 +288,9 @@ public class ContractFileController {
if (model.getName()==null||model.getName().equals(" ")){ if (model.getName()==null||model.getName().equals(" ")){
return ActionResult.fail("合同导入供应商是必填项"); return ActionResult.fail("合同导入供应商是必填项");
} }
if (model.getContractNo()==null||model.getContractNo().equals(" ")){
return ActionResult.fail("合同导入对方合同号是必填项");
}
} }
//导入数据 //导入数据
ContractfileImportVO result = contractFileService.importData(dataList); ContractfileImportVO result = contractFileService.importData(dataList);

18
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -937,6 +937,24 @@ public class TradeuploadController {
if (list != null && list.size()>0 && !ObjectUtil.equal(id, list.get(0).getId())){ if (list != null && list.size()>0 && !ObjectUtil.equal(id, list.get(0).getId())){
return ActionResult.fail("磅单重复"); return ActionResult.fail("磅单重复");
} }
if (list.size()>0 && entity.getPurchaseorderId()!=null){
QueryWrapper<PurchaseorderEntity> PurchaseorderqueryWrapper = new QueryWrapper<>();
PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getId,entity.getPurchaseorderId());
List<PurchaseorderEntity> Pur = purchaseorderService.list(PurchaseorderqueryWrapper);
int s=Integer.valueOf(Pur.get(0).getIsPayment());
if (list !=null && list.get(0).getPurchaseorderId()!=null && s==1){
int s21=Integer.valueOf(tradeuploadUpForm.getCustomerId());
int s22=Integer.valueOf(list.get(0).getCustomerId());
if (s21==s22){
tradeuploadService.update(id, subentity);
return ActionResult.success("更新成功");
}else if (s21!=s22){
return ActionResult.fail("提了付款申请不能修改客户");
}
}
}
tradeuploadService.update(id, subentity); tradeuploadService.update(id, subentity);
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ }else{

12
SC-web/src/views/scm/basicInformation/contractfile/index.vue
Unescape View File

@ -257,12 +257,12 @@
</el-button> </el-button>
<!-- <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑--> <!-- <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
class="JNPF-table-delBtn" <!-- class="JNPF-table-delBtn"-->
@click="handleDel(scope.row.id)" <!-- @click="handleDel(scope.row.id)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
<el-button <el-button
type="text" type="text"
v-has="'btn_look'" v-has="'btn_look'"

14
SC-web/src/views/scm/basicInformation/natural/index.vue
Unescape View File

@ -182,13 +182,13 @@
v-has="'btn_edit'" v-has="'btn_edit'"
>编辑 >编辑
</el-button> </el-button>
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
class="JNPF-table-delBtn" <!-- class="JNPF-table-delBtn"-->
v-has="'btn_remove'" <!-- v-has="'btn_remove'"-->
@click="handleDel(scope.row.id)" <!-- @click="handleDel(scope.row.id)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>

14
SC-web/src/views/scm/basicInformation/reservoirarea/index.vue
Unescape View File

@ -152,13 +152,13 @@
@click="addOrUpdateHandle(scope.row.id)" @click="addOrUpdateHandle(scope.row.id)"
>编辑 >编辑
</el-button> </el-button>
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
v-has="'btn_remove'" <!-- v-has="'btn_remove'"-->
class="JNPF-table-delBtn" <!-- class="JNPF-table-delBtn"-->
@click="handleDel(scope.row.id)" <!-- @click="handleDel(scope.row.id)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>

14
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -156,13 +156,13 @@
@click="addOrUpdateHandle(scope.row.id)" @click="addOrUpdateHandle(scope.row.id)"
>编辑 >编辑
</el-button> </el-button>
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
v-has="'btn_remove'" <!-- v-has="'btn_remove'"-->
class="JNPF-table-delBtn" <!-- class="JNPF-table-delBtn"-->
@click="handleDel(scope.row.id)" <!-- @click="handleDel(scope.row.id)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
<el-button type="text" @click="goDetail(scope.row.id)" <el-button type="text" @click="goDetail(scope.row.id)"
>详情 >详情
</el-button> </el-button>

Write Preview
Loading…
Cancel
Save