diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/OrderTypeEnum.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/OrderTypeEnum.java index e68f989df..f4199d699 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/OrderTypeEnum.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/OrderTypeEnum.java @@ -15,7 +15,8 @@ import java.util.List; public enum OrderTypeEnum { RK("1", "入库"), - CK("2", "出库") + CK("2", "出库"), + No("0", "无盈亏") ; private final String type; private final String description; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java index c34b004d3..e3d58d0c3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java @@ -165,6 +165,12 @@ public class SmErpInventoryRecordsEntity extends Model() + .eq(SmErpInventoryRecordsEntity::getProcessInstanceId, processInstanceId) + .set(SmErpInventoryRecordsEntity::getCheckStatus, checkReason.getCheckStatus()) + .set(SmErpInventoryRecordsEntity::getCheckReason, checkReason.getCheckReason()) + ); + return R.ok(); + } /** * 修改出入库记录表 * @param inventoryRecordEditDTO 出入库记录表 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java index 8398a1943..37f2e1d28 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java @@ -10,7 +10,12 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.security.util.SecurityUtils; +import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; +import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; +import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; +import com.bsd.pjcloud.flow.task.entity.Process; import com.bsd.pjcloud.supermarket.constant.OrderTypeEnum; +import com.bsd.pjcloud.supermarket.constant.SupermarketFlowConstant; import com.bsd.pjcloud.supermarket.dto.cgdd.SmCgDDSaveItemDTO; import com.bsd.pjcloud.supermarket.dto.inventoryrecords.*; import com.bsd.pjcloud.supermarket.entity.*; @@ -53,6 +58,8 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl processR = remoteFlowApiFlowService.getProcessByBusinessKey(SupermarketFlowConstant.SUPERMARKET_BHSQ_FLOW); + String flowId = processR.getData().getFlowId(); + ProcessInstanceParamDto processInstanceParamDto = new ProcessInstanceParamDto(); + processInstanceParamDto.setFlowId(flowId); + R stringR = remoteFlowApiFlowService.startProcessInstance(processInstanceParamDto); + String processInstanceId = stringR.getData(); + smErpCgDdEntity.setProcessInstanceId(processInstanceId); + smErpCgDdEntity.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode()); + int insert = baseMapper.insert(smErpCgDdEntity); List cgPlanItemEntities = BeanUtils.toBean(items, SmErpInventoryRecordsItemEntity.class); @@ -85,19 +103,21 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SmErpCgDdEntity::getCode, inventoryRecordSaveDTO.getInventoryCode()); @@ -466,10 +486,12 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId())); smErpAuxiliaryCodeService.saveBatch(smErpAuxiliaryCodeEntityList); - } else { - return R.failed("辅助条码不能为空"); } return R.ok(); @@ -258,8 +256,6 @@ public class SmErpSpuServiceImpl extends ServiceImpl