Merge branch 'refs/heads/dev' into gyj

eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java

@@ -25,6 +25,8 @@ public class SuppFlow implements Serializable {
 
     private List<ConInfos> list;
 
+    private String remark;
+
 
 
     @Data

eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoController.java

@@ -75,6 +75,7 @@ public class TbConsInfoController {
     @Log("耗材出入库")
     @ApiOperation("耗材出入库")
     public ResponseEntity<Object> stockInOut(@Validated @RequestBody SuppFlow resources) throws Exception {
+
         tbConsInfoService.stockInOut(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java

@@ -175,6 +175,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void stockInOut(SuppFlow resources) throws Exception {
+        log.info("resources:{}",JSON.toJSONString(resources));
         if (Objects.isNull(resources)) {
             throw new Exception("参数错误");
         }
@@ -198,7 +199,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
         operatorSnapMap.put("account", tbShopInfo.getAccount());
 
         stockOperate.setOperatorSnap(JSON.toJSONString(operatorSnapMap));
-        stockOperate.setRemark("");
+        stockOperate.setRemark(resources.getRemark());
         stockOperate.setStockTime(System.currentTimeMillis());
         stockOperate.setCreatedAt(System.currentTimeMillis());
         stockOperate.setUpdatedAt(System.currentTimeMillis());