|
|
@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.fjhx.common.constant.SourceConstant;
|
|
|
import com.fjhx.flow.core.FlowDelegate;
|
|
|
-import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
|
|
|
-import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
|
|
|
import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
|
|
|
import com.fjhx.purchase.entity.sales.enums.SalesReturnStatusEnum;
|
|
|
import com.fjhx.purchase.entity.sales.po.SalesReturn;
|
|
|
@@ -20,9 +18,7 @@ import com.fjhx.purchase.util.code.CodeEnum;
|
|
|
import com.fjhx.wms.entity.stock.po.StockWait;
|
|
|
import com.fjhx.wms.service.stock.StockWaitService;
|
|
|
import com.obs.services.internal.ServiceException;
|
|
|
-import io.seata.spring.annotation.GlobalTransactional;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
@@ -50,7 +46,6 @@ public class SalesReturnFlow extends FlowDelegate {
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
public Long start(Long flowId, JSONObject submitData) {
|
|
|
SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
|
|
|
SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
|
|
|
@@ -74,7 +69,6 @@ public class SalesReturnFlow extends FlowDelegate {
|
|
|
* @param submitData 数据
|
|
|
*/
|
|
|
@Override
|
|
|
- @GlobalTransactional
|
|
|
public void end(Long flowId, Long businessId, JSONObject submitData) {
|
|
|
SalesReturnService salesReturnService = SpringUtil.getBean(SalesReturnService.class);
|
|
|
SalesReturnDetailService salesReturnDetailService = SpringUtil.getBean(SalesReturnDetailService.class);
|
caozj