单据、拣货单权限问题

zyx

2024-04-16 6d75b9bda39c710153183844ba1e8effbb730de1

单据、拣货单权限问题

 src/main/java/com/zy/asrs/controller/ManPakOutController.java

@@ -68,6 +68,7 @@
        EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);

        String docnum = String.valueOf(param.get("doc_num"));
        if (Cools.isEmpty(docnum) || docnum.equals("null")) {
            docnum = null;
@@ -80,7 +81,7 @@
            etime = DateUtils.convert(dates[1]);
        }

        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit);
        List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,getUserId());
        for (PakOutDTO pakOutDTO:pakOutDTOS){
            List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
            for (ManPakOut manPakOut:manPakOuts){
@@ -95,7 +96,7 @@

        }

        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit);
        int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,getUserId());
        Page<PakOutDTO> page = new Page<>();
        // 最后按状态未出库->已出库排序
//        page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -92,7 +92,7 @@
        excludeTrash(param);
        // 限制销售角色只能看自己创建的单子（销售角色id固定21，不能随意修改）
        User user = getUser();
        if (user.getRoleId() == 21) {
        if (user.getRoleId() != 2 && user.getRoleId() != 24) {
            wrapper.eq("create_by", user.getId());
        }
        // 订单表只存了操作人id,所以操作人姓名查询，只能从姓名先去找id，

 src/main/java/com/zy/asrs/controller/PakoutController.java

@@ -19,6 +19,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.PakoutService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -52,6 +53,14 @@
        EntityWrapper<Pakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);

        User user = getUser();
        if (user.getRoleId() != 2 || user.getRoleId() != 24) {
            wrapper.eq("create_by", user.getId());
        }



        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(pakoutService.selectPage(new Page<>(curr, limit), wrapper));
    }

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -171,7 +171,7 @@
            plaService.updateById(pla);
            plaQtyService.insert(plaQty);
            //生成拣货单
            addPakOUT(plaQty);
            addPakOUT(plaQty,getUserId());

        };

@@ -354,7 +354,7 @@
        }
    }

    private R addPakOUT(PlaQty plaQty){
    private R addPakOUT(PlaQty plaQty,Long userId){
        ManPakOut manPakOut=new ManPakOut();
        manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
        manPakOut.setWrkSts((long)1);
@@ -372,6 +372,9 @@
        manPakOut.setDocId(plaQty.getOrderDetlId());
        manPakOut.setNodeId(plaQty.getId());
        manPakOut.setCustName(plaQty.getCustomer());
        manPakOut.setCreateBy(userId);
        //预计发货时间
        manPakOut.setSpecs(plaQty.getPakoutTime());
        //manPakOut.setNodeId(plaQty.getOrderDetlId());
        manPakOutService.insert(manPakOut);
        return R.ok();

 src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java

@@ -16,7 +16,7 @@



    List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit);
    List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId);

    int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit);
    int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId);
}

 src/main/java/com/zy/asrs/service/ManPakOutService.java

@@ -8,7 +8,7 @@
import java.util.List;

public interface ManPakOutService extends IService<ManPakOut> {
    List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit);
    List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId);

    int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit);
    int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId);
}

 src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java

@@ -17,12 +17,12 @@


    @Override
    public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit) {
        return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit);
    public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId) {
        return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId);
    }

    @Override
    public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit) {
        return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit);
    public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId) {
        return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId);
    }
}

 src/main/resources/application.yml

@@ -14,7 +14,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=hzjzwms
#   url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzhnewms
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzhnewms
    username: sa
    password: sa@123

 src/main/resources/mapper/ManPakOutMapper.xml

@@ -12,7 +12,7 @@
        <if test="etime != null">
            and create_time &lt;= #{etime}
        </if>

        and (create_by = #{userId} or create_by is null)

    </sql>


 src/main/webapp/static/js/picking/picking.js

@@ -113,7 +113,7 @@
                layer.open({
                    type: 1,
                    title: '单据明细',
                    area: '1200px',
                    area: '1500px',
                    offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
                    shade: .01,
                    shadeClose: true,
@@ -146,6 +146,7 @@
                                ,{field: 'count', align: 'center',title: '完成数'}
                                ,{field: 'status$', align: 'center',title: '状态'}
                                ,{field: 'memo', align: 'center',title: '备注'}
                                ,{field: 'specs', align: 'center',title: '发货时间'}
                                ,{field: 'createBy', align: 'center',title: '', hide:true}
                                ,{align: 'center', title: '操作', toolbar: '#operateDetl'}
                            ]],