Skip to content

J
jiedao-app-operator-master
Switch branch/tag
You can move around the graph by using the arrow keys.
Created with Raphaël 2.2.030Mar2928272625242322212019171615141312111098765432128Feb27252423222119181716151413121110987643131Jan30292817161514131110965432131Dec3029282726252423222120直接修改储位的判断条件更正入仓操作，缺少整板、箱号的计算规则type=1 非下单货物 ， 0 填单货物修改放入箱数 sit入仓操作，货物首次入仓没有默认的行储位修改成功Merge remote-tracking branch 'origin/dev' into devMerge branch 'dev' of C:\Users\admin\IdeaProjects\jiedao-app-operator with conflicts.Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6订单异常品牌修复订单日志增加操作类型Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev几个订单的bugMerge remote-tracking branch 'origin/dev1.6' into dev1.6储位弹窗标题货物入仓弹窗重构Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6收款单bug修复，汇率更新银行卡不给默认信息请款单，客户和申请日期提示信息需要优化Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6操作页面的步骤增加权限添加创建人Merge remote-tracking branch 'origin/dev1.6' into dev1.6入仓选储位无效问题Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operatorMerge remote-tracking branch 'origin/dev' into dev添加创建人文案修改Merge remote-tracking branch 'origin/dev1.6' into dev1.6审批流添加注释添加文案 编辑佣金付款单、付款单，付款单详情、佣金付款单详情增加付款单编号Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6订单箱数点击后弹窗入仓记录的页面加上储位Merge branch 'dev1.6' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev1.6订单日志的权限配置付款单佣金添加审核详情客户添加操作日志，以及客户列表修改