|
@@ -530,26 +530,26 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
|
|
|
return result;
|
|
|
}
|
|
|
//判断是否有提交数据
|
|
|
- QueryWrapper<SyShippingOrder> queryWrapper = new QueryWrapper<SyShippingOrder>();
|
|
|
- queryWrapper.in("id",syShippingOrder.getIds());
|
|
|
- List<SyShippingOrder> entityList = syShippingOrderService.list(queryWrapper);
|
|
|
- if(syShippingOrder.getType().equals("1")){
|
|
|
- for (SyShippingOrder li : entityList) {
|
|
|
- if(li.getTheDocumentsState().equals("1")){
|
|
|
- result.setSuccess(false);
|
|
|
- result.setMessage("部分单据已提交,请勿重复提交!");
|
|
|
- return result;
|
|
|
- }
|
|
|
- }
|
|
|
- }else{
|
|
|
- for (SyShippingOrder li : entityList) {
|
|
|
- if(li.getTheDocumentsState().equals("0")){
|
|
|
- result.setSuccess(false);
|
|
|
- result.setMessage("部分单据已取消提交,请勿重复取消提交!");
|
|
|
- return result;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// QueryWrapper<SyShippingOrder> queryWrapper = new QueryWrapper<SyShippingOrder>();
|
|
|
+// queryWrapper.in("id",syShippingOrder.getIds());
|
|
|
+// List<SyShippingOrder> entityList = syShippingOrderService.list(queryWrapper);
|
|
|
+// if(syShippingOrder.getType().equals("1")){
|
|
|
+// for (SyShippingOrder li : entityList) {
|
|
|
+// if(li.getTheDocumentsState().equals("1")){
|
|
|
+// result.setSuccess(false);
|
|
|
+// result.setMessage("部分单据已提交,请勿重复提交!");
|
|
|
+// return result;
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }else{
|
|
|
+// for (SyShippingOrder li : entityList) {
|
|
|
+// if(li.getTheDocumentsState().equals("0")){
|
|
|
+// result.setSuccess(false);
|
|
|
+// result.setMessage("部分单据已取消提交,请勿重复取消提交!");
|
|
|
+// return result;
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
int i = syShippingOrderService.syShippingOrderSubmit(syShippingOrder.getIds(),syShippingOrder.getType());
|
|
|
if(i>0){
|